Merge pull request #1927 from Infomaniak/delete-draft-orphans

Delete Drafts orphans after sending the Sentry about them
Infomaniak · Jun 20, 2024 · 98381a9 · 98381a9
2 parents 80bbfaf + e19f398
commit 98381a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
@@ -75,8 +75,8 @@ class ThreadController @Inject constructor(
 
     /**
      * Initialize and retrieve the search Threads obtained from the API.
-     * - Format the remote threads to make them compatible with the existing logic.
-     * - Preserve old message data if it already exists locally.
+     * - Format the remote Threads to make them compatible with the existing logic.
+     * - Preserve old Messages data if it already exists locally.
      * - Handle duplicates using the existing logic.
      * @param remoteThreads The list of API Threads that need to be processed.
      * @param filterFolder The selected Folder on which we filter the Search.

diff --git a/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt b/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt
@@ -20,7 +20,6 @@ package com.infomaniak.mail.utils
 import android.os.Bundle
 import androidx.navigation.NavController
 import com.infomaniak.mail.BuildConfig
-import com.infomaniak.mail.data.cache.mailboxContent.DraftController
 import com.infomaniak.mail.data.cache.mailboxContent.MessageController
 import com.infomaniak.mail.data.cache.mailboxContent.ThreadController
 import com.infomaniak.mail.data.models.Folder
@@ -242,13 +241,12 @@ object SentryDebug {
         return orphanThreads
     }
 
-    fun sendOrphanDrafts(realm: TypedRealm) {
-        val orphanDrafts = DraftController.getOrphanDrafts(realm)
-        if (orphanDrafts.isNotEmpty()) {
+    fun sendOrphanDrafts(orphans: List<Draft>) {
+        if (orphans.isNotEmpty()) {
             Sentry.withScope { scope ->
                 scope.setExtra(
                     "orphanDrafts",
-                    orphanDrafts.joinToString {
+                    orphans.joinToString {
                         if (it.messageUid == null) {
                             "${Draft::localUuid.name}: [${it.localUuid}]"
                         } else {

diff --git a/app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt b/app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt
@@ -197,7 +197,11 @@ class DraftsActionsWorker @AssistedInject constructor(
 
         mailboxContentRealm.executeRealmCallbacks(realmActionsOnDraft)
 
-        SentryDebug.sendOrphanDrafts(mailboxContentRealm)
+        mailboxContentRealm.writeBlocking {
+            val orphans = DraftController.getOrphanDrafts(realm = this)
+            SentryDebug.sendOrphanDrafts(orphans)
+            delete(orphans)
+        }
 
         showDraftErrorNotification(isTrackedDraftSuccess, trackedDraftErrorMessageResId, trackedDraftAction)