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

am f44697e1: Merge "Return null instead of crashing when querying a bad folder." into jb-ub-mail-ur10 

* commit 'f44697e15899f15607b474159c1ce745137dd9c7':
  Return null instead of crashing when querying a bad folder.
This commit is contained in:
Yu Ping Hu 2013-06-18 18:28:57 -07:00 committed by Android Git Automerger
parent 945ad42795 f44697e158
commit 6e9a519923
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3141,11 +3141,12 @@ public class EmailProvider extends ContentProvider {
private final FolderList mFolderList; private final FolderList mFolderList;
private final Bundle mExtras = new Bundle(); private final Bundle mExtras = new Bundle();
public EmailConversationCursor(Context context, Cursor cursor, long mailboxId) { public EmailConversationCursor(final Context context, final Cursor cursor,
final Folder folder, final long mailboxId) {
super(cursor); super(cursor);
mMailboxId = mailboxId; mMailboxId = mailboxId;
mContext = context; mContext = context;
mFolderList = FolderList.copyOf(Lists.newArrayList(getFolder(mContext, mMailboxId))); mFolderList = FolderList.copyOf(Lists.newArrayList(folder));
Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId); Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
// We assume that all message lists are complete // We assume that all message lists are complete
@ -3367,6 +3368,11 @@ public class EmailProvider extends ContentProvider {
break; break;
case UI_MESSAGES: case UI_MESSAGES:
long mailboxId = Long.parseLong(id); long mailboxId = Long.parseLong(id);
final Folder folder = getFolder(context, mailboxId);
if (folder == null) {
// This mailboxId is bogus.
return null;
}
if (isVirtualMailbox(mailboxId)) { if (isVirtualMailbox(mailboxId)) {
c = getVirtualMailboxMessagesCursor(db, uiProjection, mailboxId, unseenOnly); c = getVirtualMailboxMessagesCursor(db, uiProjection, mailboxId, unseenOnly);
} else { } else {
@ -3374,7 +3380,7 @@ public class EmailProvider extends ContentProvider {
genQueryMailboxMessages(uiProjection, unseenOnly), new String[] {id}); genQueryMailboxMessages(uiProjection, unseenOnly), new String[] {id});
} }
notifyUri = UIPROVIDER_CONVERSATION_NOTIFIER.buildUpon().appendPath(id).build(); notifyUri = UIPROVIDER_CONVERSATION_NOTIFIER.buildUpon().appendPath(id).build();
c = new EmailConversationCursor(context, c, mailboxId); c = new EmailConversationCursor(context, c, folder, mailboxId);
break; break;
case UI_MESSAGE: case UI_MESSAGE:
MessageQuery qq = genQueryViewMessage(uiProjection, id); MessageQuery qq = genQueryViewMessage(uiProjection, id);