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

Unverified Commit 351874b9 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6185 from arissystem/Issue-6184

Cc and Bcc text fields checked when handling hide empty field
parents 3ba8a2b3 d27a566a
Loading
Loading
Loading
Loading
+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> {
+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