From c0cb734288f43b2f571adbbe57ee59b059320c6e Mon Sep 17 00:00:00 2001
From: Koji Arai <jca02266@gmail.com>
Date: Sun, 19 Feb 2012 00:26:28 +0900
Subject: [PATCH] Should change Bcc address when Identity changed.

---
 src/com/fsck/k9/activity/MessageCompose.java | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 3b5e0589f..8d9ad60f7 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -734,13 +734,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             }
 
             if (mAction != Action.EDIT_DRAFT) {
-                String bccAddress = mAccount.getAlwaysBcc();
-                if ((bccAddress != null) && !("".equals(bccAddress))) {
-                    String[] bccAddresses = bccAddress.split(",");
-                    for (String oneBccAddress : bccAddresses) {
-                        addAddress(mBccView, new Address(oneBccAddress, ""));
-                    }
-                }
+                addAddresses(mBccView, mAccount.getAlwaysBcc());
             }
 
             updateTitle();
@@ -1132,6 +1126,15 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         }
     }
 
+    private void addAddresses(MultiAutoCompleteTextView view, String addresses) {
+        if (StringUtils.isNullOrEmpty(addresses)) {
+            return;
+        }
+        for (String address : addresses.split(",")) {
+            addAddress(view, new Address(address, ""));
+        }
+    }
+
     private void addAddresses(MultiAutoCompleteTextView view, Address[] addresses) {
         if (addresses == null) {
             return;
@@ -2067,6 +2070,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         mIdentityChanged = true;
         mDraftNeedsSaving = true;
         updateFrom();
+        updateBcc();
         updateSignature();
         updateMessageFormat();
     }
@@ -2075,6 +2079,14 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         mChooseIdentityButton.setText(mIdentity.getEmail());
     }
 
+    private void updateBcc() {
+        if (mIdentityChanged) {
+            mBccWrapper.setVisibility(View.VISIBLE);
+        }
+        mBccView.setText("");
+        addAddresses(mBccView, mAccount.getAlwaysBcc());
+    }
+
     private void updateSignature() {
         if (mIdentity.getSignatureUse()) {
             mSignatureView.setText(mIdentity.getSignature());