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
This commit is contained in:
Mindy Pereira 2012-07-16 14:35:44 -07:00
parent a0aff17b05
commit ab076fa633
1 changed files with 5 additions and 3 deletions

View File

@ -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;
}