commit e4af65d7d7f18a8955bd809db6d3da9d2315dba8
author Milos Stankovic <miloss@google.com> Sun Nov 02 19:06:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 19:06:07 2014 +0000
tree 42fe659e67e325d67cc14fb23c7cc9835ac85a82
parent cac57f7e1621684b3bbbd7673ca87011ce88fe94
parent 637388117670a07794389950bd6405270f369829

am 63738811: Fix NPE when folderUri is null.

* commit '637388117670a07794389950bd6405270f369829':
  Fix NPE when folderUri is null.

src/com/android/mail/MailIntentService.java

diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java
index 72abd55..8151dfc 100644
--- a/src/com/android/mail/MailIntentService.java
+++ b/src/com/android/mail/MailIntentService.java
@@ -84,10 +84,13 @@
                     null, 0);
         } else if (ACTION_RESEND_NOTIFICATIONS.equals(action)) {
             final Uri accountUri = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT_URI);
-            final Uri folderUri = intent.getParcelableExtra(Utils.EXTRA_FOLDER_URI);
 
-            NotificationUtils.resendNotifications(this, false, accountUri,
-                    new FolderUri(folderUri), getContactFetcher());
+            final Uri extraFolderUri = intent.getParcelableExtra(Utils.EXTRA_FOLDER_URI);
+            final FolderUri folderUri =
+                    extraFolderUri == null ? null : new FolderUri(extraFolderUri);
+
+            NotificationUtils.resendNotifications(
+                    this, false, accountUri, folderUri, getContactFetcher());
         } else if (ACTION_RESEND_NOTIFICATIONS_WEAR.equals(action)) {
             final Account account = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
             final Folder folder = intent.getParcelableExtra(Utils.EXTRA_FOLDER);