Correctly copyFromRealm() the mailboxLocalValues when we want to …

…update them
Infomaniak · Sep 30, 2024 · 8e192fd · 8e192fd
1 parent 56f1a67
commit 8e192fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxInfo/MailboxController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxInfo/MailboxController.kt
@@ -30,6 +30,7 @@ import io.realm.kotlin.MutableRealm
 import io.realm.kotlin.Realm
 import io.realm.kotlin.TypedRealm
 import io.realm.kotlin.UpdatePolicy
+import io.realm.kotlin.ext.copyFromRealm
 import io.realm.kotlin.ext.query
 import io.realm.kotlin.notifications.SingleQueryChange
 import io.realm.kotlin.query.*
@@ -100,13 +101,10 @@ class MailboxController @Inject constructor(
             val remoteMailboxesIds = remoteMailboxes.map { remoteMailbox ->
 
                 SentryLog.d(RealmDatabase.TAG, "Mailboxes: Get current data")
-                val previousLocalValues = getMailbox(userId, remoteMailbox.mailboxId, realm = this)?.local
+                val previousLocalValues = getMailbox(userId, remoteMailbox.mailboxId, realm = this)?.local?.copyFromRealm()
 
                 SentryLog.d(RealmDatabase.TAG, "Mailboxes: Save new data")
-                remoteMailbox.initLocalValues(
-                    userId = userId,
-                    localValues = previousLocalValues,
-                )
+                remoteMailbox.initLocalValues(userId, previousLocalValues)
                 copyToRealm(remoteMailbox, UpdatePolicy.ALL)
 
                 return@map remoteMailbox.mailboxId

diff --git a/app/src/main/java/com/infomaniak/mail/data/models/mailbox/Mailbox.kt b/app/src/main/java/com/infomaniak/mail/data/models/mailbox/Mailbox.kt
@@ -25,6 +25,7 @@ import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.utils.UnreadDisplay
 import com.infomaniak.mail.utils.extensions.getDefault
+import io.realm.kotlin.ext.copyFromRealm
 import io.realm.kotlin.ext.realmListOf
 import io.realm.kotlin.serializers.RealmListKSerializer
 import io.realm.kotlin.types.RealmObject
@@ -91,6 +92,12 @@ class Mailbox : RealmObject {
         local.userId = userId
     }
 
+    fun setFeatureFlags(featureFlags: List<String>) {
+        mailboxLocalValues = local.copyFromRealm().also {
+            it.featureFlags.setFeatureFlags(featureFlags)
+        }
+    }
+
     fun getDefaultSignatureWithFallback(draftMode: DraftMode? = null): Signature = with(local) {
         return signatures.getDefault(draftMode) ?: signatures.first()
     }

diff --git a/app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt
@@ -118,8 +118,8 @@ class SharedUtils @Inject constructor(
     fun updateFeatureFlags(mailboxObjectId: String, mailboxUuid: String) {
         with(ApiRepository.getFeatureFlags(mailboxUuid)) {
             if (isSuccess()) {
-                mailboxController.updateMailbox(mailboxObjectId) { mailbox ->
-                    mailbox.local.featureFlags.setFeatureFlags(featureFlags = data ?: emptyList())
+                mailboxController.updateMailbox(mailboxObjectId) {
+                    it.setFeatureFlags(featureFlags = data ?: emptyList())
                 }
             }
         }