From ab076fa6334182bb93e3420b9459c201ffae5a88 Mon Sep 17 00:00:00 2001 From: Mindy Pereira Date: Mon, 16 Jul 2012 14:35:44 -0700 Subject: [PATCH] Account and Folder are both json objects now. We dont have a seperate parcelable account and serialized account string (for pending and regular intents) Fixes b/6805342 Email crash on opening message from notification bar Change-Id: I5b310fbafefb8dd82b9e222421fb624703b1676b --- src/com/android/email/NotificationController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java index 42112fbd7..ca87c65fd 100644 --- a/src/com/android/email/NotificationController.java +++ b/src/com/android/email/NotificationController.java @@ -393,9 +393,11 @@ public class NotificationController { com.android.mail.providers.Account account) { final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - intent.setDataAndType(conversation.uri, account.mimeType); - intent.putExtra(EXTRA_ACCOUNT, account); - intent.putExtra(EXTRA_FOLDER, folder); + intent.putExtra(EXTRA_ACCOUNT, account.serialize()); + if (folder != null) { + intent.setDataAndType(folder.uri, account.mimeType); + intent.putExtra(EXTRA_FOLDER, folder.serialize()); + } intent.putExtra(EXTRA_CONVERSATION, conversation); return intent; }