refactor: Remove now useless computation of isThereDuplicatedThreads

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt

@@ -562,30 +562,13 @@ class RefreshController @Inject constructor(
         // Other pre-existing Threads that will also require this Message and will provide the prior Messages for this new Thread.
         val existingThreads = ThreadController.getThreadsByMessageIds(remoteMessage.messageIds, realm = this)
         val existingMessages = getExistingMessages(existingThreads)
-        // Some Messages don't have references to all previous Messages of the Thread (ex: these from the iOS Mail app).
-        // Because we are missing the links between Messages, it will create multiple Threads for the same Folder.
-        // Hence, we need to find these duplicates.
-        // TODO: Find a way to compute this boolean in `updateExistingThreads()` if possible
-        val isThereDuplicatedThreads = isThereDuplicatedThreads(remoteMessage.messageIds, existingThreads.count())
 
         val thread = createNewThreadIfRequired(scope, remoteMessage, existingThreads, existingMessages)
-
-        val impactedThreads = updateExistingThreads(
-            scope = scope,
-            remoteMessage = remoteMessage,
-            existingThreads = existingThreads,
-            existingMessages = existingMessages,
-            isThereDuplicatedThreads = isThereDuplicatedThreads,
-        )
+        val impactedThreads = updateExistingThreads(scope, remoteMessage, existingThreads, existingMessages)
 
         return thread to impactedThreads
     }
 
-    private fun MutableRealm.isThereDuplicatedThreads(messageIds: RealmSet<String>, threadsCount: Int): Boolean {
-        val foldersCount = ThreadController.getExistingThreadsFoldersCount(messageIds, realm = this)
-        return foldersCount != threadsCount.toLong()
-    }
-
     private fun TypedRealm.createNewThreadIfRequired(
         scope: CoroutineScope,
         newMessage: Message,
@@ -609,20 +592,19 @@ class RefreshController @Inject constructor(
         remoteMessage: Message,
         existingThreads: RealmResults<Thread>,
         existingMessages: Set<Message>,
-        isThereDuplicatedThreads: Boolean,
     ): Set<Thread> {
 
         val impactedThreads = mutableSetOf<Thread>()
 
         // Update already existing Threads (i.e. in other Folders, or specific cases like Snoozed)
         impactedThreads += addAllMessagesToAllThreads(scope, remoteMessage, existingThreads, existingMessages)
 
-        // Now that all existing Threads are updated, we need to remove the duplicated Threads.
-        if (isThereDuplicatedThreads) {
-            val duplicatedThreads = identifyExtraDuplicatedThreads(remoteMessage.messageIds)
-            impactedThreads -= duplicatedThreads
-            duplicatedThreads.forEach(::delete) // Delete the other Threads. Sorry bro, you won't be missed.
-        }
+        // Some Messages don't have references to all previous Messages of the Thread (ex: these from the iOS Mail app).
+        // Because we are missing the links between Messages, it will create multiple Threads for the same Folder.
+        // Hence, we need to find these duplicates, and remove them.
+        val duplicatedThreads = identifyExtraDuplicatedThreads(remoteMessage.messageIds)
+        impactedThreads -= duplicatedThreads
+        duplicatedThreads.forEach(::delete) // Delete the other Threads. Sorry bro, you won't be missed.
 
         return impactedThreads
     }

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt

@@ -200,10 +200,6 @@ class ThreadController @Inject constructor(
             return realm.query("ANY ${Thread::messagesIds.name} IN $0", messageIds)
         }
 
-        private fun getExistingThreadsFoldersCountQuery(messageIds: Set<String>, realm: TypedRealm): RealmScalarQuery<Long> {
-            return getThreadsByMessageIdsQuery(messageIds, realm).distinct(Thread::folderId.name).count()
-        }
-
         private fun getSearchThreadsQuery(realm: TypedRealm): RealmQuery<Thread> {
             return realm.query<Thread>("${Thread::isFromSearch.name} == true").sort(Thread::date.name, Sort.DESCENDING)
         }
@@ -266,10 +262,6 @@ class ThreadController @Inject constructor(
             return getThreadsByMessageIdsQuery(messageIds, realm).find()
         }
 
-        fun getExistingThreadsFoldersCount(messageIds: Set<String>, realm: TypedRealm): Long {
-            return getExistingThreadsFoldersCountQuery(messageIds, realm).find()
-        }
-
         fun getUnreadThreadsCount(folder: Folder): Int {
             return getUnreadThreadsCountQuery(folder).find().toInt()
         }