Merge pull request thunderbird#6185 from arissystem/Issue-6184

Cc and Bcc text fields checked when handling hide empty field
milad-d · Jul 25, 2022 · 351874b · 351874b
2 parents 3ba8a2b + d27a566
commit 351874b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt
@@ -72,6 +72,12 @@ class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChang
     val bccRecipients: List<Recipient>
         get() = bccView.objects
 
+    val isCcTextEmpty: Boolean
+        get() = ccView.text.isEmpty()
+
+    val isBccTextEmpty: Boolean
+        get() = bccView.text.isEmpty()
+
     fun setPresenter(presenter: RecipientPresenter) {
         this.presenter = presenter
         toView.setTokenListener(object : RecipientSelectView.TokenListener<Recipient> {

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt
@@ -347,14 +347,14 @@ class RecipientPresenter(
     }
 
     private fun hideEmptyExtendedRecipientFields() {
-        if (recipientMvpView.ccAddresses.isEmpty()) {
+        if (recipientMvpView.ccAddresses.isEmpty() && recipientMvpView.isCcTextEmpty) {
             recipientMvpView.setCcVisibility(false)
             if (lastFocusedType == RecipientType.CC) {
                 lastFocusedType = RecipientType.TO
             }
         }
 
-        if (recipientMvpView.bccAddresses.isEmpty()) {
+        if (recipientMvpView.bccAddresses.isEmpty() && recipientMvpView.isBccTextEmpty) {
             recipientMvpView.setBccVisibility(false)
             if (lastFocusedType == RecipientType.BCC) {
                 lastFocusedType = RecipientType.TO