Skip to content

Commit 7f42c3d

Browse files
KevinBoulongneKevinBoulongne
committed
Use externalMailInfo API call instead of mailboxes one to get ExternalMail info
1 parent e819913 commit 7f42c3d

File tree

11 files changed

+98
-19
lines changed

11 files changed

+98
-19
lines changed

‎app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt

+5
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import com.infomaniak.mail.data.models.getMessages.ActivitiesResult
4646
import com.infomaniak.mail.data.models.getMessages.GetMessagesByUidsResult
4747
import com.infomaniak.mail.data.models.getMessages.NewMessagesResult
4848
import com.infomaniak.mail.data.models.mailbox.Mailbox
49+
import com.infomaniak.mail.data.models.mailbox.MailboxExternalMailInfo
4950
import com.infomaniak.mail.data.models.mailbox.MailboxLinkedResult
5051
import com.infomaniak.mail.data.models.mailbox.MailboxPermissions
5152
import com.infomaniak.mail.data.models.message.Message
@@ -145,6 +146,10 @@ object ApiRepository : ApiRepositoryCore() {
145146
return callApi(ApiRoutes.permissions(mailboxLinkId, mailboxHostingId), GET)
146147
}
147148

149+
fun getExternalMailInfo(mailboxHostingId: Int, mailboxName: String): ApiResponse<MailboxExternalMailInfo> {
150+
return callApi(ApiRoutes.externalMailInfo(mailboxHostingId, mailboxName), GET)
151+
}
152+
148153
fun markMessagesAsSeen(mailboxUuid: String, messagesUids: List<String>): ApiResponse<Unit> {
149154
return callApi(ApiRoutes.messagesSeen(mailboxUuid), POST, mapOf("uids" to messagesUids))
150155
}

‎app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt

+4
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ object ApiRoutes {
7373
return "$MAIL_API/api/securedProxy"
7474
}
7575

76+
fun externalMailInfo(mailboxHostingId: Int, mailboxName: String): String {
77+
return "${securedProxy()}/1/mail_hostings/$mailboxHostingId/mailboxes/$mailboxName/external_mail_flag"
78+
}
79+
7680
fun updateMailboxPassword(mailboxId: Int): String {
7781
return "${securedProxy()}/cache/invalidation/profile/workspace/mailbox/$mailboxId/update_password"
7882
}

‎app/src/main/java/com/infomaniak/mail/data/cache/RealmDatabase.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ object RealmDatabase {
158158

159159
//region Configurations versions
160160
const val USER_INFO_SCHEMA_VERSION = 1L
161-
const val MAILBOX_INFO_SCHEMA_VERSION = 4L
161+
const val MAILBOX_INFO_SCHEMA_VERSION = 5L
162162
const val MAILBOX_CONTENT_SCHEMA_VERSION = 8L
163163
//endregion
164164

‎app/src/main/java/com/infomaniak/mail/data/models/correspondent/Recipient.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ open class Recipient : EmbeddedRealmObject, Correspondent {
6464

6565
// Computes if the Recipient is external, according to the required conditions.
6666
// Does not tell anything about how to display the Recipient chip when composing a new Message.
67-
fun isExternal(emailDictionary: MergedContactDictionary, aliases: List<String>): Boolean {
67+
fun isExternal(emailDictionary: MergedContactDictionary, aliases: List<String>, trustedDomains: List<String>): Boolean {
6868
val isUnknownContact = email !in emailDictionary
6969
val isMailerDaemon = """mailer-daemon@(?:.+\.)?infomaniak\.ch""".toRegex(RegexOption.IGNORE_CASE).matches(email)
70-
val trustedDomains = listOf("@infomaniak.com", "@infomaniak.event", "@swisstransfer.com")
7170
val isUntrustedDomain = email.isEmail() && trustedDomains.none { email.endsWith(it) }
7271
val isAlias = email in aliases
7372

‎app/src/main/java/com/infomaniak/mail/data/models/mailbox/Mailbox.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ class Mailbox : RealmObject {
6262
@SerialName("unseen_messages")
6363
var unreadCountRemote: Int = 0
6464
var aliases: RealmList<String> = realmListOf()
65-
@SerialName("external_mail_flag_enabled")
66-
var externalMailFlagEnabled: Boolean = false
6765
//endregion
6866

6967
//region Local data (Transient)
@@ -80,6 +78,10 @@ class Mailbox : RealmObject {
8078
var permissions: MailboxPermissions? = null
8179
@Transient
8280
private var _featureFlags: RealmSet<String> = realmSetOf()
81+
@Transient
82+
var externalMailFlagEnabled: Boolean = false
83+
@Transient
84+
var trustedDomains: RealmList<String> = realmListOf()
8385
//endregion
8486

8587
//region (Transient & Ignore)

‎app/src/main/java/com/infomaniak/mail/data/models/mailbox/MailboxExternalMailInfo.kt

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Infomaniak Mail - Android
3+
* Copyright (C) 2024 Infomaniak Network SA
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
package com.infomaniak.mail.data.models.mailbox
19+
20+
import kotlinx.serialization.SerialName
21+
import kotlinx.serialization.Serializable
22+
23+
@Serializable
24+
data class MailboxExternalMailInfo(
25+
@SerialName("external_mail_flag_enabled")
26+
val externalMailFlagEnabled: Boolean = false,
27+
@SerialName("domains")
28+
val trustedDomains: List<String> = emptyList(),
29+
)

‎app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt

+12
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import com.infomaniak.mail.utils.Utils.runCatchingRealm
6363
import com.infomaniak.mail.views.itemViews.AvatarMergedContactData
6464
import dagger.hilt.android.lifecycle.HiltViewModel
6565
import io.realm.kotlin.ext.copyFromRealm
66+
import io.realm.kotlin.ext.toRealmList
6667
import io.realm.kotlin.notifications.ResultsChange
6768
import kotlinx.coroutines.*
6869
import kotlinx.coroutines.flow.*
@@ -280,6 +281,7 @@ class MainViewModel @Inject constructor(
280281
updatePermissions(mailbox)
281282
updateSignatures(mailbox)
282283
updateFeatureFlag(mailbox)
284+
updateExternalMailInfo(mailbox)
283285

284286
// This update is blocking because we need it for the rest of the flow : `selectFolder()` needs the Folders.
285287
updateFolders(mailbox)
@@ -342,6 +344,16 @@ class MainViewModel @Inject constructor(
342344
sharedUtils.updateAiFeatureFlag(mailbox.objectId, mailbox.uuid)
343345
}
344346

347+
private fun updateExternalMailInfo(mailbox: Mailbox) = viewModelScope.launch(ioCoroutineContext) {
348+
SentryLog.d(TAG, "Force refresh External Mail info")
349+
with(ApiRepository.getExternalMailInfo(mailbox.hostingId, mailbox.mailboxName)) {
350+
if (isSuccess() && data != null) mailboxController.updateMailbox(mailbox.objectId) {
351+
it.externalMailFlagEnabled = data!!.externalMailFlagEnabled
352+
it.trustedDomains = data!!.trustedDomains.toRealmList()
353+
}
354+
}
355+
}
356+
345357
private fun updateFolders(mailbox: Mailbox) {
346358
SentryLog.d(TAG, "Force refresh Folders")
347359
ApiRepository.getFolders(mailbox.uuid).data?.let { folders ->

‎app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ class ThreadFragment : Fragment() {
375375
emailDictionary = result.mergedContacts ?: emptyMap(),
376376
aliases = result.mailbox?.aliases ?: emptyList(),
377377
externalMailFlagEnabled = result.mailbox?.externalMailFlagEnabled ?: false,
378+
trustedDomains = result.mailbox?.trustedDomains ?: emptyList(),
378379
)
379380

380381
threadSubject.text = spannedSubject
@@ -551,11 +552,14 @@ class ThreadFragment : Fragment() {
551552
emailDictionary: MergedContactDictionary,
552553
aliases: List<String>,
553554
externalMailFlagEnabled: Boolean,
555+
trustedDomains: List<String>,
554556
): Pair<String, CharSequence> = with(binding) {
555557
val subject = context.formatSubject(thread.subject)
556558
if (!externalMailFlagEnabled) return subject to subject
557559

558-
val (externalRecipientEmail, externalRecipientQuantity) = thread.findExternalRecipients(emailDictionary, aliases)
560+
val (externalRecipientEmail, externalRecipientQuantity) = thread.findExternalRecipients(
561+
emailDictionary, aliases, trustedDomains,
562+
)
559563
if (externalRecipientQuantity == 0) return subject to subject
560564

561565
val spannedSubject = requireContext().postfixWithTag(

‎app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageExternalsManager.kt

+21-8
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,40 @@ class NewMessageExternalsManager @Inject constructor() : NewMessageManager() {
5050
fun observeExternals(arrivedFromExistingDraft: Boolean) = with(newMessageViewModel) {
5151
Utils.waitInitMediator(initResult, mergedContacts).observe(viewLifecycleOwner) { (_, mergedContacts) ->
5252
val externalMailFlagEnabled = currentMailbox.externalMailFlagEnabled
53+
val trustedDomains = currentMailbox.trustedDomains
5354
val shouldWarnForExternal = externalMailFlagEnabled && !arrivedFromExistingDraft
5455
val emailDictionary = mergedContacts.second
5556
val aliases = currentMailbox.aliases
5657

57-
updateFields(shouldWarnForExternal, emailDictionary, aliases)
58-
updateBanner(shouldWarnForExternal, emailDictionary, aliases)
58+
updateFields(shouldWarnForExternal, emailDictionary, aliases, trustedDomains)
59+
updateBanner(shouldWarnForExternal, emailDictionary, aliases, trustedDomains)
5960
}
6061
}
6162

62-
private fun updateFields(shouldWarnForExternal: Boolean, emailDictionary: MergedContactDictionary, aliases: List<String>) {
63+
private fun updateFields(
64+
shouldWarnForExternal: Boolean,
65+
emailDictionary: MergedContactDictionary,
66+
aliases: List<String>,
67+
trustedDomains: List<String>,
68+
) {
6369
with(binding) {
64-
toField.updateExternals(shouldWarnForExternal, emailDictionary, aliases)
65-
ccField.updateExternals(shouldWarnForExternal, emailDictionary, aliases)
66-
bccField.updateExternals(shouldWarnForExternal, emailDictionary, aliases)
70+
toField.updateExternals(shouldWarnForExternal, emailDictionary, aliases, trustedDomains)
71+
ccField.updateExternals(shouldWarnForExternal, emailDictionary, aliases, trustedDomains)
72+
bccField.updateExternals(shouldWarnForExternal, emailDictionary, aliases, trustedDomains)
6773
}
6874
}
6975

70-
private fun updateBanner(shouldWarnForExternal: Boolean, emailDictionary: MergedContactDictionary, aliases: List<String>) {
76+
private fun updateBanner(
77+
shouldWarnForExternal: Boolean,
78+
emailDictionary: MergedContactDictionary,
79+
aliases: List<String>,
80+
trustedDomains: List<String>,
81+
) {
7182
with(newMessageViewModel) {
7283
if (shouldWarnForExternal && !isExternalBannerManuallyClosed) {
73-
val (externalEmail, externalQuantity) = draft.findExternalRecipientForNewMessage(aliases, emailDictionary)
84+
val (externalEmail, externalQuantity) = draft.findExternalRecipientForNewMessage(
85+
aliases, emailDictionary, trustedDomains,
86+
)
7487
externalRecipientCount.value = externalEmail to externalQuantity
7588
}
7689
}

‎app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,16 @@ class RecipientFieldView @JvmOverloads constructor(
419419
return (if (recipientCount == 1) recipients.single().email else null) to recipientCount
420420
}
421421

422-
fun updateExternals(shouldWarnForExternal: Boolean, emailDictionary: MergedContactDictionary, aliases: List<String>) {
422+
fun updateExternals(
423+
shouldWarnForExternal: Boolean,
424+
emailDictionary: MergedContactDictionary,
425+
aliases: List<String>,
426+
trustedDomains: List<String>,
427+
) {
423428
for (recipient in contactChipAdapter.getRecipients()) {
424429
if (recipient.isManuallyEntered) continue
425430

426-
val shouldDisplayAsExternal = shouldWarnForExternal && recipient.isExternal(emailDictionary, aliases)
431+
val shouldDisplayAsExternal = shouldWarnForExternal && recipient.isExternal(emailDictionary, aliases, trustedDomains)
427432
recipient.initDisplayAsExternal(shouldDisplayAsExternal)
428433

429434
updateCollapsedChipValues(isSelfCollapsed)

‎app/src/main/java/com/infomaniak/mail/utils/ExternalUtils.kt

+9-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,22 @@ import com.infomaniak.mail.data.models.draft.Draft
2222
import com.infomaniak.mail.data.models.thread.Thread
2323

2424
object ExternalUtils {
25+
2526
/**
2627
* Only returns a quantity of at most 2, used to differentiate between the singular or plural form of the dialog messages
2728
*/
2829
fun Thread.findExternalRecipients(
2930
emailDictionary: MergedContactDictionary,
3031
aliases: List<String>,
32+
trustedDomains: List<String>,
3133
): Pair<String?, Int> {
3234
var externalRecipientEmail: String? = null
3335
var externalRecipientQuantity = 0
3436

3537
messages.forEach { message ->
36-
val (singleEmail, quantityForThisMessage) = findExternalRecipientInIterables(emailDictionary, aliases, message.from)
38+
val (singleEmail, quantityForThisMessage) = findExternalRecipientInIterables(
39+
emailDictionary, aliases, trustedDomains, message.from,
40+
)
3741

3842
externalRecipientQuantity += quantityForThisMessage
3943
if (externalRecipientQuantity > 1) return null to 2
@@ -47,11 +51,12 @@ object ExternalUtils {
4751
fun Draft.findExternalRecipientForNewMessage(
4852
aliases: List<String>,
4953
emailDictionary: MergedContactDictionary,
54+
trustedDomains: List<String>,
5055
): Pair<String?, Int> {
5156
val to = to.onlyAutomaticallyAddedOnes()
5257
val cc = cc.onlyAutomaticallyAddedOnes()
5358
val bcc = bcc.onlyAutomaticallyAddedOnes()
54-
return findExternalRecipientInIterables(emailDictionary, aliases, to, cc, bcc)
59+
return findExternalRecipientInIterables(emailDictionary, aliases, trustedDomains, to, cc, bcc)
5560
}
5661

5762
private fun List<Recipient>.onlyAutomaticallyAddedOnes(): List<Recipient> = filter { !it.isManuallyEntered }
@@ -62,14 +67,15 @@ object ExternalUtils {
6267
private fun findExternalRecipientInIterables(
6368
emailDictionary: MergedContactDictionary,
6469
aliases: List<String>,
70+
trustedDomains: List<String>,
6571
vararg recipientLists: Iterable<Recipient>,
6672
): Pair<String?, Int> {
6773
var externalRecipientEmail: String? = null
6874
var externalRecipientQuantity = 0
6975

7076
recipientLists.forEach { recipientList ->
7177
recipientList.forEach { recipient ->
72-
if (recipient.isExternal(emailDictionary, aliases)) {
78+
if (recipient.isExternal(emailDictionary, aliases, trustedDomains)) {
7379
if (externalRecipientQuantity++ == 0) {
7480
externalRecipientEmail = recipient.email
7581
} else {

0 commit comments

Comments
 (0)