From a60a2a42955a7ea04a0284467dd5dc56230b3096 Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 7 Jul 2011 04:59:45 +0200 Subject: [PATCH] Changed code to show/hide the correct views for CC/BCC Fixes issue 3509 --- src/com/fsck/k9/activity/MessageCompose.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 0cef93db5..b107cb669 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -808,8 +808,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc attachments.add(attachment.uri); } outState.putParcelableArrayList(STATE_KEY_ATTACHMENTS, attachments); - outState.putBoolean(STATE_KEY_CC_SHOWN, mCcView.getVisibility() == View.VISIBLE); - outState.putBoolean(STATE_KEY_BCC_SHOWN, mBccView.getVisibility() == View.VISIBLE); + outState.putBoolean(STATE_KEY_CC_SHOWN, mCcWrapper.getVisibility() == View.VISIBLE); + outState.putBoolean(STATE_KEY_BCC_SHOWN, mBccWrapper.getVisibility() == View.VISIBLE); outState.putSerializable(STATE_KEY_QUOTED_TEXT_MODE, mQuotedTextMode); outState.putBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, mSourceMessageProcessed); outState.putString(STATE_KEY_DRAFT_UID, mDraftUid); @@ -2005,7 +2005,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc } } - mCcView.setVisibility(View.VISIBLE); + mCcWrapper.setVisibility(View.VISIBLE); } } } else if (ACTION_FORWARD.equals(action)) { @@ -2031,7 +2031,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc addAddresses(mToView, message.getRecipients(RecipientType.TO)); if (message.getRecipients(RecipientType.CC).length > 0) { addAddresses(mCcView, message.getRecipients(RecipientType.CC)); - mCcView.setVisibility(View.VISIBLE); + mCcWrapper.setVisibility(View.VISIBLE); } Address[] bccRecipients = message.getRecipients(RecipientType.BCC); @@ -2040,9 +2040,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc String bccAddress = mAccount.getAlwaysBcc(); if (bccRecipients.length == 1 && bccAddress != null && bccAddress.equals(bccRecipients[0].toString())) { // If the auto-bcc is the only entry in the BCC list, don't show the Bcc fields. - mBccView.setVisibility(View.GONE); + mBccWrapper.setVisibility(View.GONE); } else { - mBccView.setVisibility(View.VISIBLE); + mBccWrapper.setVisibility(View.VISIBLE); } }