refactor: Clean some code

Infomaniak · Mar 6, 2025 · 0a92c13 · 0a92c13
1 parent 5941f74
commit 0a92c13
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/FolderController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/FolderController.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2022-2025 Infomaniak Network SA
+ * Copyright (C) 2022-2024 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt
@@ -270,10 +270,9 @@ class RefreshController @Inject constructor(
         var inboxUnreadCount: Int? = null
         write {
             val refreshStrategy = folder.refreshStrategy()
-            val impactedFolders = ImpactedFolders().also {
-                it += handleDeletedUids(scope, activities.deletedShortUids, folder.id, refreshStrategy)
-                it += handleUpdatedUids(scope, activities.updatedMessages, folder.id, refreshStrategy)
-            }
+            val impactedFolders = ImpactedFolders()
+            impactedFolders += handleDeletedUids(scope, activities.deletedShortUids, folder.id, refreshStrategy)
+            impactedFolders += handleUpdatedUids(scope, activities.updatedMessages, folder.id, refreshStrategy)
 
             inboxUnreadCount = updateFoldersUnreadCount(impactedFolders, realm = this)
 
@@ -649,12 +648,14 @@ class RefreshController @Inject constructor(
             extraFolderUpdates?.invoke(currentFolder)
         }
 
-        // TODO: Explain better
-        // Some folders such as inbox and snooze require to query again the other folder's threads as well
+        // Some folders such as inbox and snooze require to query again the other folder's threads as well. For example, if a
+        // message uid is returned as "added" or "deleted" in the snooze folder, it should disappear or appear from inbox as well.
         currentFolderRefreshStrategy.otherFolderRolesToQueryThreads().forEach { folderRole ->
             getUpToDateFolder(folderRole)?.let { otherFolder ->
-                val allThreads = otherFolder.refreshStrategy().queryFolderThreads(folderId, realm = this)
-                otherFolder.threads.replaceContent(list = allThreads)
+                val allOtherFolderThreads = otherFolder.refreshStrategy().queryFolderThreads(folderId, realm = this)
+                otherFolder.threads.replaceContent(list = allOtherFolderThreads)
+
+                if (otherFolder.role == FolderRole.SCHEDULED_DRAFTS) otherFolder.isDisplayed = otherFolder.threads.isNotEmpty()
             }
         }
     }

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshStrategies.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshStrategies.kt
@@ -31,15 +31,15 @@ import kotlinx.coroutines.ensureActive
 
 interface RefreshStrategy {
     fun queryFolderThreads(folderId: String, realm: TypedRealm): List<Thread>
-    fun otherFolderRolesToQueryThreads(): List<Folder.FolderRole> // TODO: Couple it tighter with queryFolderThreads()?
+    fun otherFolderRolesToQueryThreads(): List<Folder.FolderRole>
 
     fun getMessageFromShortUid(shortUid: String, folderId: String, realm: TypedRealm): Message?
 
     /**
      * @return The list of impacted threads that have changed and need to be recomputed. The list of impacted threads will also be
      * used to determine what folders need to have their unread count updated. If an extra folder needs its unread count updated
      * but no thread has that extra folder as [Thread.folderId], you can define the extra folder you want inside
-     * [addFolderToImpactedFolders] as you they are inserted inside the list of impacted folders.
+     * [addFolderToImpactedFolders] as they will be inserted inside the list of impacted folders.
      */
     fun processDeletedMessage(
         scope: CoroutineScope,