ProtonMail
/
protoncore_android
mirror of https://github.com/ProtonMail/protoncore_android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(send-preferences): Force refreshing contact cards to define send preferences 

To ensure up-to-date sending preferences are used also immediately after
they were changed from another client, we force refresh data that is not
coming through the event loop and which is needed to define them.

MAILANDR-1250
This commit is contained in:
Marino Meneghel 2024-04-02 17:41:53 +02:00
parent db6de90587
commit d89ebc8b3d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail-send-preferences/domain/src/main/kotlin/me/proton/core/mailsendpreferences/domain/usecase/ObtainSendPreferences.kt
View File

@ -93,7 +93,7 @@ class ObtainSendPreferences @Inject constructor(
val sendPreferencesOrError = if (contactEmail?.defaults == false.toInt()) { // custom Send Preferences
val contactWithCards = contactEmailsRepository.getContactWithCards(user.userId, contactEmail.contactId)
val contactWithCards = contactEmailsRepository.getContactWithCards(user.userId, contactEmail.contactId, true)
user.useKeys(cryptoContext) {

12
mail-send-preferences/domain/src/test/kotlin/me.proton.core.mailsendpreferences.domain/usecase/ObtainSendPreferencesTests.kt
View File

@ -116,7 +116,7 @@ class ObtainSendPreferencesTests {
contacWith2PinnedKeysContactEmail
)
coEvery { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("contact_1")) } returns externalContactWithPinnedKeyBrokenSignature
coEvery { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("contact_1"), true) } returns externalContactWithPinnedKeyBrokenSignature
coEvery { getRecipientPublicAddressesMock.invoke(userId, any()) } returns mapOf(
"disabled_address@pm.me" to null, // address is disabled
@ -268,7 +268,7 @@ class ObtainSendPreferencesTests {
val map = sut(userId, emails)
coVerify(exactly = 1) { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("contact_1")) }
coVerify(exactly = 1) { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("contact_1"), true) }
val result = map["contact_external_pinned_key+alias@email.com"]
println(result)
@ -286,7 +286,7 @@ class ObtainSendPreferencesTests {
every { pgpCryptoMock.isKeyExpired(any()) } returns false
every { pgpCryptoMock.isKeyRevoked(any()) } returns false
coEvery { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys")) } returns contactWith2PinnedKeys
coEvery { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys"), true) } returns contactWith2PinnedKeys
mockkStatic(KeyHolderContext::decryptContactCard)
every { any<KeyHolderContext>().decryptContactCard(any()) } returns DecryptedVCard(Ezvcard.parse(contactWith2PinnedKeys.contactCards.filterIsInstance<ContactCard.Signed>().first().data).first(), VerificationStatus.Success)
@ -295,7 +295,7 @@ class ObtainSendPreferencesTests {
val result = sut(userId, emails)
coVerify(exactly = 1) { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys")) }
coVerify(exactly = 1) { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys"), true) }
with (result[emailWithPinnedKeys] as ObtainSendPreferences.Result.Success) {
assertTrue(this.sendPreferences.sign)
@ -317,7 +317,7 @@ class ObtainSendPreferencesTests {
every { pgpCryptoMock.isKeyExpired(any()) } returns false
every { pgpCryptoMock.isKeyRevoked(any()) } returns false
coEvery { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys")) } returns contactWith2PinnedKeys
coEvery { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys"), true) } returns contactWith2PinnedKeys
mockkStatic(KeyHolderContext::decryptContactCard)
every { any<KeyHolderContext>().decryptContactCard(any()) } returns DecryptedVCard(Ezvcard.parse(contactWith2PinnedKeys.contactCards.filterIsInstance<ContactCard.Signed>().first().data).first(), VerificationStatus.Success)
@ -326,7 +326,7 @@ class ObtainSendPreferencesTests {
val result = sut(userId, emails)
coVerify(exactly = 1) { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys")) }
coVerify(exactly = 1) { contactEmailsRepositoryMock.getContactWithCards(userId, ContactId("ID of contact with 2 pinned keys"), true) }
with (result[emailWithPinnedKeys] as ObtainSendPreferences.Result.Success) {
assertTrue(this.sendPreferences.sign)