commit 92227f6b35b3bec54609dc0feb9dd6756c2a43e6
author Paul Westbrook <pwestbro@google.com> Tue Mar 20 10:32:51 2012 -0700
committer Paul Westbrook <pwestbro@google.com> Tue Mar 20 10:34:19 2012 -0700
tree 6aab9fd631bde6860e0423b05d18135d3eafb982
parent c3aee106f90e4eacd13e90ff136f11d4c366cd19

Fix crash when Compose is triggered from external app

Bug: 6197382
Change-Id: I3cefd195edc2442e77e3a589f2ac35c5459f4e39

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 1812e2a..7061351 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -72,6 +72,7 @@
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.MessageColumns;
 import com.android.mail.R;
+import com.android.mail.utils.AccountUtils;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
 import com.android.ex.chips.RecipientEditTextView;
@@ -221,7 +222,16 @@
         setContentView(R.layout.compose);
         findViews();
         Intent intent = getIntent();
-        setAccount((Account)intent.getParcelableExtra(Utils.EXTRA_ACCOUNT));
+
+        Account account = (Account)intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
+        if (account == null) {
+            final Account[] syncingAccounts = AccountUtils.getSyncingAccounts(this);
+            if (syncingAccounts.length > 0) {
+                account = syncingAccounts[0];
+            }
+        }
+
+        setAccount(account);
         if (mAccount == null) {
             return;
         }