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:
parent
a0aff17b05
commit
ab076fa633
|
@ -393,9 +393,11 @@ public class NotificationController {
|
||||||
com.android.mail.providers.Account account) {
|
com.android.mail.providers.Account account) {
|
||||||
final Intent intent = new Intent(Intent.ACTION_VIEW);
|
final Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||||
intent.setDataAndType(conversation.uri, account.mimeType);
|
intent.putExtra(EXTRA_ACCOUNT, account.serialize());
|
||||||
intent.putExtra(EXTRA_ACCOUNT, account);
|
if (folder != null) {
|
||||||
intent.putExtra(EXTRA_FOLDER, folder);
|
intent.setDataAndType(folder.uri, account.mimeType);
|
||||||
|
intent.putExtra(EXTRA_FOLDER, folder.serialize());
|
||||||
|
}
|
||||||
intent.putExtra(EXTRA_CONVERSATION, conversation);
|
intent.putExtra(EXTRA_CONVERSATION, conversation);
|
||||||
return intent;
|
return intent;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue