moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-26 09:38:52 -05:00
Code Issues Releases Wiki Activity

Issue 503

Browse Source 
Restore lost confirmation dialog.
This commit is contained in:
Daniel Applebaum 2009-08-29 21:49:19 +00:00
parent 280ed0dadd
commit 033632b3ba
2 changed files with 85 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/com/android/email/activity/FolderList.java
View File

@ -6,8 +6,12 @@ import java.util.Collections;
import java.util.Date;
import com.android.email.K9ListActivity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.NotificationManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
@ -642,7 +646,7 @@ public class FolderList extends K9ListActivity {
break;
case R.id.mark_all_as_read:
MessagingController.getInstance(getApplication()).markAllMessagesRead(mAccount, folder.name);
onMarkAllAsRead(mAccount, folder.name);
break;
case R.id.send_messages:
@ -676,6 +680,79 @@ public class FolderList extends K9ListActivity {
return super.onContextItemSelected(item);
}
private Account mSelectedContextAccount = null;
private FolderInfoHolder mSelectedContextFolder = null;
private void onMarkAllAsRead(final Account account, final String folder) {
mSelectedContextAccount = account;
mSelectedContextFolder = mAdapter.getFolder(folder);
showDialog(DIALOG_MARK_ALL_AS_READ);
}
@Override
public Dialog onCreateDialog(int id) {
switch (id) {
case DIALOG_MARK_ALL_AS_READ:
return createMarkAllAsReadDialog();
}
return super.onCreateDialog(id);
}
public void onPrepareDialog(int id, Dialog dialog) {
switch (id) {
case DIALOG_MARK_ALL_AS_READ:
((AlertDialog)dialog).setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
mSelectedContextFolder.displayName));
break;
default:
super.onPrepareDialog(id, dialog);
}
}
private Dialog createMarkAllAsReadDialog() {
return new AlertDialog.Builder(this)
.setTitle(R.string.mark_all_as_read_dlg_title)
.setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
mSelectedContextFolder.displayName))
.setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
dismissDialog(DIALOG_MARK_ALL_AS_READ);
try {
MessagingController.getInstance(getApplication()).markAllMessagesRead(mSelectedContextAccount, mSelectedContextFolder.name);
for (MessageInfoHolder holder : mSelectedContextFolder.messages) {
holder.read = true;
}
mSelectedContextFolder.unreadMessageCount = 0;
mHandler.dataChanged();
} catch (Exception e) {
// Ignore
}
}
})
.setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
dismissDialog(DIALOG_MARK_ALL_AS_READ);
}
})
.create();
}
@Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);

11
src/com/android/email/activity/MessageList.java
View File

@ -821,9 +821,12 @@ public class MessageList extends K9ListActivity {
private Account mSelectedContextAccount = null;
private FolderInfoHolder mSelectedContextFolder = null;
private void onMarkAllAsRead(final Account account, final FolderInfoHolder folder) {
private void onMarkAllAsRead(final Account account, final String folder) {
mSelectedContextAccount = account;
mSelectedContextFolder = folder;
mSelectedContextFolder = mAdapter.getFolder(folder);
showDialog(DIALOG_MARK_ALL_AS_READ);
}
@ -968,8 +971,8 @@ public class MessageList extends K9ListActivity {
return true;
case R.id.mark_all_as_read:
MessagingController.getInstance(getApplication()).markAllMessagesRead(mAccount, mFolderName);
onMarkAllAsRead(mAccount, mFolderName);
return true;
case R.id.folder_settings: