wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6185 from arissystem/Issue-6184

Browse source 
Cc and Bcc text fields checked when handling hide empty field
This commit is contained in:
cketti 2022-07-25 11:03:56 +02:00 committed by GitHub
commit 351874b9b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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> {

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

@ -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