Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing parameters in Mailbox.initLocalValues() #2057

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Add missing parameters in Mailbox.initLocalValues() #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/main/java/com/infomaniak/mail/data/cache/mailboxInfo/MailboxController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,12 @@ class MailboxController @Inject constructor(
it.initLocalValues(
userId = userId,
quotas = localMailbox?.quotas,
inboxUnreadCount = localMailbox?.unreadCountLocal ?: 0,
inboxUnreadCount = localMailbox?.unreadCountLocal,
permissions = localMailbox?.permissions,
signatures = localMailbox?.signatures,
featureFlags = localMailbox?._featureFlags,
externalMailFlagEnabled = localMailbox?.externalMailFlagEnabled,
trustedDomains = localMailbox?.trustedDomains,
)
}
}
Expand Down
20 changes: 17 additions & 3 deletions app/src/main/java/com/infomaniak/mail/data/models/mailbox/Mailbox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ class Mailbox : RealmObject {
@Transient
var signatures = realmListOf<Signature>()
@Transient
private var _featureFlags = realmSetOf<String>()
var _featureFlags = realmSetOf<String>()
private set
@Transient
var externalMailFlagEnabled: Boolean = false
@Transient
Expand Down Expand Up @@ -108,12 +109,25 @@ class Mailbox : RealmObject {

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

fun initLocalValues(userId: Int, quotas: Quotas?, inboxUnreadCount: Int, permissions: MailboxPermissions?) {
fun initLocalValues(
userId: Int,
quotas: Quotas?,
inboxUnreadCount: Int?,
permissions: MailboxPermissions?,
signatures: List<Signature>?,
featureFlags: Set<String>?,
externalMailFlagEnabled: Boolean?,
trustedDomains: List<String>?,
) {
this.objectId = createObjectId(userId)
this.userId = userId
this.quotas = quotas
this.unreadCountLocal = inboxUnreadCount
inboxUnreadCount?.let { this.unreadCountLocal = it }
this.permissions = permissions
signatures?.let(this.signatures::addAll)
featureFlags?.let(this._featureFlags::addAll)
externalMailFlagEnabled?.let { this.externalMailFlagEnabled = it }
trustedDomains?.let(this.trustedDomains::addAll)
}

fun getDefaultSignatureWithFallback(draftMode: DraftMode? = null): Signature {
Expand Down
Loading