commit 1220b6dc0d1dd8069651231da4521d316c485f91
author Paul Westbrook <pwestbro@google.com> Tue Apr 10 00:48:00 2012 -0700
committer Paul Westbrook <pwestbro@google.com> Tue Apr 10 00:48:00 2012 -0700
tree 9c1530fdcaa62383a27b4eaac563d87637d48c7d
parent e1c6132ad5fb786c893dc38d540b16920c5bf0c3

Prevent NPE when no inboxUri

This prevents a crash in Email when no inbox uri is
returned.  This is a temporary fix until we have the
"wait fragment" in place

Bug: 6309927
Change-Id: Ia2cf05d02d32c1a6a3278cf09bf35d1806af886b

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index d4cfd8a..a9356aa 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -943,14 +943,17 @@
                 break;
             case LOADER_ACCOUNT_INBOX:
                 Settings settings = getSettings();
-                Uri inboxUri;
+                final Uri inboxUri;
                 if (settings != null) {
                     inboxUri = settings.defaultInbox;
                 } else {
                     inboxUri = mAccount.folderListUri;
                 }
-                return new CursorLoader(mContext, inboxUri, UIProvider.FOLDERS_PROJECTION, null,
-                        null, null);
+                if (inboxUri != null) {
+                    return new CursorLoader(mContext, inboxUri, UIProvider.FOLDERS_PROJECTION, null,
+                            null, null);
+                }
+                break;
             case LOADER_SEARCH:
                 return Folder.forSearchResults(mAccount,
                         args.getString(ConversationListContext.EXTRA_SEARCH_QUERY),