commit c97ec3e157f1b2a30ebdc96ba9c6007f2f719aa6
author Paul Westbrook <pwestbro@google.com> Fri Jul 12 18:17:19 2013 -0700
committer Paul Westbrook <pwestbro@google.com> Fri Jul 12 18:17:19 2013 -0700
tree 208a0679205d572de1328ea7811b34712cb7113d
parent 81aea35d45b3d0191ec595562a2fcf67009845d5

Fix replying from "combined account"

A bug to tracking the addition of the unit test has been filed
in bug 9823857

Bug: 9595801
Change-Id: Ie5eb8b5ea4cfddf9c111144c7b5b8ad2844e31b3

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 ed6ae53..fa31833 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -667,7 +667,7 @@
         // Update the from spinner as other accounts
         // may now be available.
         if (mFromSpinner != null && mAccount != null) {
-            mFromSpinner.asyncInitFromSpinner(mComposeMode, mAccount, mAccounts);
+            mFromSpinner.initialize(mComposeMode, mAccount, mAccounts, mRefMessage);
         }
     }
 
@@ -863,17 +863,17 @@
     }
 
     private void initFromSpinner(Bundle bundle, int action) {
-        String accountString = null;
         if (action == EDIT_DRAFT && mDraft.draftType == UIProvider.DraftType.COMPOSE) {
             action = COMPOSE;
         }
-        mFromSpinner.asyncInitFromSpinner(action, mAccount, mAccounts);
+        mFromSpinner.initialize(action, mAccount, mAccounts, mRefMessage);
+
         if (bundle != null) {
             if (bundle.containsKey(EXTRA_SELECTED_REPLY_FROM_ACCOUNT)) {
                 mReplyFromAccount = ReplyFromAccount.deserialize(mAccount,
                         bundle.getString(EXTRA_SELECTED_REPLY_FROM_ACCOUNT));
             } else if (bundle.containsKey(EXTRA_FROM_ACCOUNT_STRING)) {
-                accountString = bundle.getString(EXTRA_FROM_ACCOUNT_STRING);
+                final String accountString = bundle.getString(EXTRA_FROM_ACCOUNT_STRING);
                 mReplyFromAccount = mFromSpinner.getMatchingReplyFromAccount(accountString);
             }
         }
@@ -895,11 +895,11 @@
             // Otherwise, give the user the ability to choose which account to
             // send mail from / save drafts to.
             mFromStatic.setVisibility(View.GONE);
-            mFromStaticText.setText(mAccount.name);
+            mFromStaticText.setText(mReplyFromAccount.name);
             mFromSpinnerWrapper.setVisibility(View.VISIBLE);
         } else {
             mFromStatic.setVisibility(View.VISIBLE);
-            mFromStaticText.setText(mAccount.name);
+            mFromStaticText.setText(mReplyFromAccount.name);
             mFromSpinnerWrapper.setVisibility(View.GONE);
         }
     }