diff options
| author | Milos Stankovic <miloss@google.com> | 2014-11-02 20:51:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 20:51:01 +0000 |
| commit | 3ea0faaad59ab5a103230a949c2402dd0060f725 (patch) | |
| tree | 54aa38b433d086476dd0c6c163cd333f35a78af0 /src | |
| parent | f137cd590b0e501cdc9e75e538bfa1feb84c5f7f (diff) | |
| parent | b9d285387ff812c300b48c7dc5c5797de8bbf86b (diff) | |
| download | UnifiedEmail-3ea0faaad59ab5a103230a949c2402dd0060f725.tar.gz | |
am b9d28538: am bfe7345c: am 5a806882: am e4af65d7: am 63738811: Fix NPE when folderUri is null.
* commit 'b9d285387ff812c300b48c7dc5c5797de8bbf86b':
Fix NPE when folderUri is null.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/MailIntentService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java index 72abd553c..8151dfc28 100644 --- a/src/com/android/mail/MailIntentService.java +++ b/src/com/android/mail/MailIntentService.java @@ -84,10 +84,13 @@ public class MailIntentService extends IntentService { 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); |