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

Prevent NPE getting non-existent mailbox

Browse Source 
Change-Id: I0c0bbc64a9b9871344ae5704f9d098073a1d425d
This commit is contained in:
Marc Blank 2012-06-20 09:55:32 -07:00
parent 384c467d0e
commit 58d0db2709
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2544,18 +2544,18 @@ outer:
}
values.put(UIProvider.FolderColumns.CAPABILITIES, caps);
}
}
// For trash, we don't allow undo
if (mailbox.mType == Mailbox.TYPE_TRASH) {
values.put(UIProvider.FolderColumns.CAPABILITIES,
UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES |
UIProvider.FolderCapabilities.CAN_HOLD_MAIL |
UIProvider.FolderCapabilities.DELETE_ACTION_FINAL);
}
if (isVirtualMailbox(mailboxId)) {
int capa = values.getAsInteger(UIProvider.FolderColumns.CAPABILITIES);
values.put(UIProvider.FolderColumns.CAPABILITIES,
capa | UIProvider.FolderCapabilities.IS_VIRTUAL);
// For trash, we don't allow undo
if (mailbox.mType == Mailbox.TYPE_TRASH) {
values.put(UIProvider.FolderColumns.CAPABILITIES,
UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES |
UIProvider.FolderCapabilities.CAN_HOLD_MAIL |
UIProvider.FolderCapabilities.DELETE_ACTION_FINAL);
}
if (isVirtualMailbox(mailboxId)) {
int capa = values.getAsInteger(UIProvider.FolderColumns.CAPABILITIES);
values.put(UIProvider.FolderColumns.CAPABILITIES,
capa | UIProvider.FolderCapabilities.IS_VIRTUAL);
}
}
}
StringBuilder sb = genSelect(sFolderListMap, uiProjection, values);