From 1956152e28fd6f54b5ef7882a9e531683484d328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=CC=81lvaro=20Oliveira?= Date: Mon, 7 Oct 2024 23:03:09 +0100 Subject: [PATCH] Fix spacing between To label and email addresses --- .../java/com/fsck/k9/helper/MessageHelper.kt | 2 +- .../com/fsck/k9/helper/MessageHelperTest.kt | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt b/legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt index a36dc77909d..b33eaec36d5 100644 --- a/legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt +++ b/legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt @@ -34,7 +34,7 @@ class MessageHelper( } val repository = if (isShowContactName) contactRepository else null val recipients = toFriendly(addresses, repository) - return SpannableStringBuilder(resourceProvider.contactDisplayNamePrefix()).append(recipients) + return SpannableStringBuilder(resourceProvider.contactDisplayNamePrefix()).append(' ').append(recipients) } companion object { diff --git a/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt b/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt index fc7d3a982cf..c07fb629e72 100644 --- a/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt +++ b/legacy/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt @@ -10,6 +10,8 @@ import app.k9mail.core.common.mail.toEmailAddressOrThrow import assertk.assertThat import assertk.assertions.isEqualTo import assertk.assertions.isInstanceOf +import com.fsck.k9.CoreResourceProvider +import com.fsck.k9.TestCoreResourceProvider import com.fsck.k9.helper.MessageHelper.Companion.toFriendly import com.fsck.k9.mail.Address import org.junit.Test @@ -20,6 +22,8 @@ import org.mockito.kotlin.stub class MessageHelperTest : RobolectricTest() { private val contactRepository: ContactRepository = mock() + private val resourceProvider: CoreResourceProvider = TestCoreResourceProvider() + private val messageHelper: MessageHelper = MessageHelper(resourceProvider, contactRepository) @Test fun testToFriendlyShowsPersonalPartIfItExists() { @@ -116,6 +120,32 @@ class MessageHelperTest : RobolectricTest() { assertThat(friendly).isEqualTo("Tim@Testor") } + @Test + fun testGetSenderDisplayNameWithShowContactNameShouldReturnCorrectOutput() { + val address1 = Address("test@testor.com", "Tim Testor") + val address2 = Address("foo@bar.com", "Foo Bar") + val addresses = arrayOf(address1, address2) + setupContactRepositoryWithFakeContact(EMAIL_ADDRESS) + val displayName = messageHelper.getRecipientDisplayNames(addresses) + assertThat(displayName.toString()).isEqualTo("To: Tim Testor,Foo Bar") + } + + @Test + fun testGetSenderDisplayNameWithoutShowContactNameShouldReturnCorrectOutput() { + val address1 = Address("test@testor.com") + val address2 = Address("foo@bar.com") + val addresses = arrayOf(address1, address2) + + val displayName = messageHelper.getRecipientDisplayNames(addresses) + assertThat(displayName.toString()).isEqualTo("To: test@testor.com,foo@bar.com") + } + + @Test + fun testGetSenderDisplayNameWithoutInputReturnCorrectOutput() { + val displayName = messageHelper.getRecipientDisplayNames(null) + assertThat(displayName.toString()).isEqualTo(resourceProvider.contactUnknownRecipient()) + } + private fun setupContactRepositoryWithFakeContact(emailAddress: EmailAddress) { contactRepository.stub { on { getContactFor(emailAddress) } doReturn