Merge "Support the new MOVE_FAILED_TO_DRAFT operation in Email" into ub-gmail-ur14-dev

This commit is contained in:
Jin Cao 2014-08-04 17:51:02 +00:00 committed by Android (Google) Code Review
commit 65848dc5e0

View File

@ -5246,7 +5246,9 @@ public class EmailProvider extends ContentProvider
// Another special case - deleting a draft.
final String operation = values.getAsString(
UIProvider.ConversationOperations.OPERATION_KEY);
if (UIProvider.ConversationOperations.DISCARD_DRAFTS.equals(operation)) {
// TODO: for now let's just default to delete for MOVE_FAILED_TO_DRAFT operation
if (UIProvider.ConversationOperations.DISCARD_DRAFTS.equals(operation) ||
UIProvider.ConversationOperations.MOVE_FAILED_TO_DRAFTS.equals(operation)) {
uiDeleteMessage(uri);
return 1;
}