moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Should change Bcc address when Identity changed.

This commit is contained in:
Koji Arai 2012-02-19 00:26:28 +09:00
parent 1abc8619b1
commit c0cb734288
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -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());