Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc3e4b1 authored by r.zarchi's avatar r.zarchi Committed by cketti
Browse files

Cc and Bcc text fields checked when handling hide empty field

parent f45c5024

app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt

+6 −0
Original line number Diff line number Diff line
@@ -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> {

app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt

+2 −2
Original line number Diff line number Diff line
@@ -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