Fix wrong Folder ID in Search Messages

Author: KevinBoulongne

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

@@ -80,7 +80,7 @@ class ThreadController @Inject constructor(
      */
     suspend fun initAndGetSearchFolderThreads(
         remoteThreads: List<Thread>,
-        folderRole: FolderRole?,
+        filterFolder: Folder?,
     ): List<Thread> = withContext(ioDispatcher) {
 
         fun MutableRealm.keepOldMessagesAndAddToSearchFolder(remoteThread: Thread, searchFolder: Folder) {
@@ -95,7 +95,7 @@ class ThreadController @Inject constructor(
                 remoteMessage.initLocalValues(
                     date = localMessage?.date ?: remoteMessage.date,
                     isFullyDownloaded = localMessage?.isFullyDownloaded() ?: false,
-                    isTrashed = folderRole == FolderRole.TRASH,
+                    isTrashed = filterFolder?.role == FolderRole.TRASH,
                     isFromSearch = localMessage == null,
                     draftLocalUuid = localMessage?.draftLocalUuid,
                     latestCalendarEventResponse = null,
@@ -113,7 +113,13 @@ class ThreadController @Inject constructor(
             remoteThreads.map { remoteThread ->
                 ensureActive()
                 remoteThread.isFromSearch = true
-                remoteThread.folderId = remoteThread.messages.first().folderId
+
+                val folderId = if (remoteThread.messages.count() == 1) {
+                    remoteThread.messages.single().folderId
+                } else {
+                    filterFolder!!.id
+                }
+                remoteThread.folderId = folderId
 
                 keepOldMessagesAndAddToSearchFolder(remoteThread, searchFolder)
 

app/src/main/java/com/infomaniak/mail/ui/main/search/SearchViewModel.kt

@@ -209,11 +209,8 @@ class SearchViewModel @Inject constructor(
 
         suspend fun ApiResponse<ThreadResult>.initSearchFolderThreads() {
             runCatching {
-                data?.threads?.let {
-                    threadController.initAndGetSearchFolderThreads(
-                        remoteThreads = it,
-                        folderRole = folder?.role
-                    )
+                data?.threads?.let { remoteThreads ->
+                    threadController.initAndGetSearchFolderThreads(remoteThreads, folder)
                 }
             }.getOrElse { exception ->
                 exception.printStackTrace()