Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master

This commit is contained in:
Jay Shrauner 2014-07-14 22:29:14 +00:00 committed by Android (Google) Code Review
commit 5c93d36616
1 changed files with 3 additions and 2 deletions

View File

@ -4887,11 +4887,12 @@ public class EmailProvider extends ContentProvider
final Mailbox mailbox =
getMailboxByAccountIdAndType(accountId, Mailbox.TYPE_DRAFTS);
if (mailbox == null) return null;
final Message msg;
Message msg = null;
if (extras.containsKey(BaseColumns._ID)) {
final long messageId = extras.getLong(BaseColumns._ID);
msg = Message.restoreMessageWithId(getContext(), messageId);
} else {
}
if (msg == null) {
msg = new Message();
}
return uiSaveMessage(msg, mailbox, extras);