Merge pull request #1713 from Infomaniak/loader-too-long

Only display Loader for current Folder

Author: KevinBoulongne

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

@@ -258,7 +258,12 @@ class RefreshController @Inject constructor(
 
         return when (refreshMode) {
             REFRESH_FOLDER_WITH_ROLE -> refreshWithRoleConsideration(scope)
-            REFRESH_FOLDER -> refresh(scope, initialFolder)
+            REFRESH_FOLDER -> {
+                refresh(scope, initialFolder).also {
+                    onStop?.invoke()
+                    clearCallbacks()
+                }
+            }
             ONE_PAGE_OF_OLD_MESSAGES -> {
                 fetchOneOldPage(scope, initialFolder)
                 emptySet()
@@ -269,6 +274,8 @@ class RefreshController @Inject constructor(
     private suspend fun Realm.refreshWithRoleConsideration(scope: CoroutineScope): Set<Thread> {
 
         val impactedThreads = refresh(scope, initialFolder)
+        onStop?.invoke()
+        clearCallbacks()
 
         when (initialFolder.role) {
             FolderRole.INBOX -> listOf(FolderRole.SENT, FolderRole.DRAFT)
@@ -839,13 +846,11 @@ class RefreshController @Inject constructor(
     //region Handle errors
     private fun handleAllExceptions(throwable: Throwable) {
 
-        // We force-cancelled, so we need to call the `stopped` callback.
-        if (throwable is ForcedCancellationException) onStop?.invoke()
-
-        // It failed, but not because we cancelled it. Something bad happened, so we call the `stopped` callback.
-        if (throwable !is CancellationException) onStop?.invoke()
-
         if (throwable is ApiErrorException) throwable.handleOtherApiErrors()
+
+        // This is the end. The `onStop` callback should be called before we are gone.
+        onStop?.invoke()
+        clearCallbacks()
     }
 
     private fun ApiErrorException.handleOtherApiErrors() {

app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt

@@ -661,7 +661,13 @@ class MainViewModel @Inject constructor(
         if (isSeen) {
             markAsUnseen(mailbox, threads, message)
         } else {
-            sharedUtils.markAsSeen(mailbox, threads, message, RefreshCallbacks(::onDownloadStart, ::onDownloadStop))
+            sharedUtils.markAsSeen(
+                mailbox = mailbox,
+                threads = threads,
+                message = message,
+                currentFolderId = currentFolderId,
+                callbacks = RefreshCallbacks(::onDownloadStart, ::onDownloadStop),
+            )
         }
     }
 
@@ -842,7 +848,6 @@ class MainViewModel @Inject constructor(
                     mailbox = mailbox,
                     messagesFoldersIds = foldersIds,
                     destinationFolderId = destinationFolderId,
-                    callbacks = RefreshCallbacks(::onDownloadStart, ::onDownloadStop),
                 )
                 R.string.snackbarMoveCancelled
             } else {
@@ -889,7 +894,7 @@ class MainViewModel @Inject constructor(
         destinationFolderId: String? = null,
         callbacks: RefreshCallbacks? = null,
     ) = viewModelScope.launch(ioCoroutineContext) {
-        sharedUtils.refreshFolders(mailbox, messagesFoldersIds, destinationFolderId, callbacks)
+        sharedUtils.refreshFolders(mailbox, messagesFoldersIds, destinationFolderId, currentFolderId, callbacks)
     }
 
     private fun onDownloadStart() {
@@ -985,7 +990,6 @@ class MainViewModel @Inject constructor(
                 mailbox = currentMailbox.value!!,
                 folder = folder,
                 realm = mailboxContentRealm(),
-                callbacks = RefreshCallbacks(::onDownloadStart, ::onDownloadStop),
             )
         }
     }

app/src/main/java/com/infomaniak/mail/utils/SharedUtils.kt

@@ -67,6 +67,7 @@ class SharedUtils @Inject constructor(
         mailbox: Mailbox,
         threads: List<Thread>,
         message: Message? = null,
+        currentFolderId: String? = null,
         callbacks: RefreshCallbacks? = null,
         shouldRefreshThreads: Boolean = true,
     ) {
@@ -82,6 +83,7 @@ class SharedUtils @Inject constructor(
             refreshFolders(
                 mailbox = mailbox,
                 messagesFoldersIds = messages.getFoldersIds(),
+                currentFolderId = currentFolderId,
                 callbacks = callbacks,
             )
         }
@@ -96,6 +98,7 @@ class SharedUtils @Inject constructor(
         mailbox: Mailbox,
         messagesFoldersIds: List<String>,
         destinationFolderId: String? = null,
+        currentFolderId: String? = null,
         callbacks: RefreshCallbacks? = null,
     ) {
 
@@ -110,7 +113,7 @@ class SharedUtils @Inject constructor(
                     mailbox = mailbox,
                     folder = folder,
                     realm = mailboxContentRealm(),
-                    callbacks = callbacks,
+                    callbacks = if (folderId == currentFolderId) callbacks else null,
                 )
             }
         }