ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Confirm calendar invite response, and delete message" into jb-dev

Browse Source
This commit is contained in:
Marc Blank 2012-04-26 20:41:47 -07:00 committed by Android (Google) Code Review
commit b3cf559736
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
email2/res/values/strings.xml
View File

@ -1308,5 +1308,8 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- This is the message warning the user that they must sync manually when roaming. [CHAR LIMIT=none]-->
<string name="require_manual_sync_message">Background sync for this account is disabled while\
roaming.</string>
<!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
<string name="confirm_response">Sending response...</string>
</resources>

12
email2/src/com/android/email/provider/EmailProvider.java
View File

@ -3394,6 +3394,11 @@ outer:
try {
service.sendMeetingResponse(msg.mId,
values.getAsInteger(UIProvider.MessageOperations.RESPOND_COLUMN));
// Delete the message immediately
uiDeleteMessage(uri);
Utility.showToast(context, R.string.confirm_response);
// Notify box has changed so the deletion is reflected in the UI
notifyUIConversationMailbox(mailbox.mId);
} catch (RemoteException e) {
}
return 1;
@ -3431,6 +3436,7 @@ outer:
if (mailbox.mType == Mailbox.TYPE_TRASH || mailbox.mType == Mailbox.TYPE_DRAFTS) {
// We actually delete these, including attachments
AttachmentUtilities.deleteAllAttachmentFiles(context, msg.mAccountKey, msg.mId);
notifyUI(UIPROVIDER_FOLDER_NOTIFIER, mailbox.mId);
return context.getContentResolver().delete(
ContentUris.withAppendedId(Message.CONTENT_URI, msg.mId), null, null);
}
@ -3439,6 +3445,7 @@ outer:
if (trashMailbox == null) return 0;
ContentValues values = new ContentValues();
values.put(MessageColumns.MAILBOX_KEY, trashMailbox.mId);
notifyUI(UIPROVIDER_FOLDER_NOTIFIER, mailbox.mId);
return uiUpdateMessage(uri, values);
}
@ -3460,8 +3467,9 @@ outer:
// But clear the operations
mLastSequenceOps.clear();
// Tell the UI there are changes
getContext().getContentResolver().notifyChange(UIPROVIDER_CONVERSATION_NOTIFIER,
null);
ContentResolver resolver = getContext().getContentResolver();
resolver.notifyChange(UIPROVIDER_CONVERSATION_NOTIFIER, null);
resolver.notifyChange(UIPROVIDER_FOLDER_NOTIFIER, null);
return c;
} catch (OperationApplicationException e) {
}