Skip to content

Commit 29c6f15

Browse files
Add missing parameters in Mailbox.initLocalValues()
1 parent e4ca206 commit 29c6f15

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

Diff for: app/src/main/java/com/infomaniak/mail/data/cache/mailboxInfo/MailboxController.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,12 @@ class MailboxController @Inject constructor(
104104
it.initLocalValues(
105105
userId = userId,
106106
quotas = localMailbox?.quotas,
107-
inboxUnreadCount = localMailbox?.unreadCountLocal ?: 0,
107+
inboxUnreadCount = localMailbox?.unreadCountLocal,
108108
permissions = localMailbox?.permissions,
109+
signatures = localMailbox?.signatures,
110+
featureFlags = localMailbox?._featureFlags,
111+
externalMailFlagEnabled = localMailbox?.externalMailFlagEnabled,
112+
trustedDomains = localMailbox?.trustedDomains,
109113
)
110114
}
111115
}

Diff for: app/src/main/java/com/infomaniak/mail/data/models/mailbox/Mailbox.kt

+16-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class Mailbox : RealmObject {
8080
@Transient
8181
var signatures = realmListOf<Signature>()
8282
@Transient
83-
private var _featureFlags = realmSetOf<String>()
83+
var _featureFlags = realmSetOf<String>()
8484
@Transient
8585
var externalMailFlagEnabled: Boolean = false
8686
@Transient
@@ -108,12 +108,25 @@ class Mailbox : RealmObject {
108108

109109
private fun createObjectId(userId: Int): String = "${userId}_${this.mailboxId}"
110110

111-
fun initLocalValues(userId: Int, quotas: Quotas?, inboxUnreadCount: Int, permissions: MailboxPermissions?) {
111+
fun initLocalValues(
112+
userId: Int,
113+
quotas: Quotas?,
114+
inboxUnreadCount: Int?,
115+
permissions: MailboxPermissions?,
116+
signatures: List<Signature>?,
117+
featureFlags: Set<String>?,
118+
externalMailFlagEnabled: Boolean?,
119+
trustedDomains: List<String>?,
120+
) {
112121
this.objectId = createObjectId(userId)
113122
this.userId = userId
114123
this.quotas = quotas
115-
this.unreadCountLocal = inboxUnreadCount
124+
this.unreadCountLocal = inboxUnreadCount ?: 0
116125
this.permissions = permissions
126+
signatures?.let(this.signatures::addAll)
127+
featureFlags?.let(this._featureFlags::addAll)
128+
this.externalMailFlagEnabled = externalMailFlagEnabled ?: false
129+
trustedDomains?.let(this.trustedDomains::addAll)
117130
}
118131

119132
fun getDefaultSignatureWithFallback(draftMode: DraftMode? = null): Signature {

0 commit comments

Comments
 (0)