Merge pull request #2092 from Infomaniak/update-sentry-condition

fix: Add missing Search folder check in a Sentry

app/src/main/java/com/infomaniak/mail/data/models/message/Message.kt

@@ -22,6 +22,7 @@ package com.infomaniak.mail.data.models.message
 import com.infomaniak.lib.core.utils.Utils.enumValueOfOrNull
 import com.infomaniak.mail.data.api.RealmInstantSerializer
 import com.infomaniak.mail.data.api.UnwrappingJsonListSerializer
+import com.infomaniak.mail.data.cache.mailboxContent.FolderController
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.Bimi
 import com.infomaniak.mail.data.models.SwissTransferFile
@@ -157,13 +158,11 @@ class Message : RealmObject {
 
     private val threadsDuplicatedIn by backlinks(Thread::duplicates)
 
-    // TODO: When there is no more issue with the `_folders` backlink in the Thread model,
-    //  we will be able to replace this `first { … }` with `first()`.
+    // TODO: Remove this `runCatching / getOrElse` when the issue is fixed
     inline val folder
         get() = runCatching {
-            threads.single { it.folder.id == folderId }.folder
+            threads.single { it.folder.id == folderId || it.folder.id == FolderController.SEARCH_FOLDER_ID }.folder
         }.getOrElse { exception ->
-            // TODO: I think this Sentry can't happen, but better safe than sorry. Weird possibilities are endless.
 
             val reason = when {
                 threads.isEmpty() -> "no parent Threads" // Message has 0 parent threads
@@ -185,7 +184,7 @@ class Message : RealmObject {
                 scope.setExtra("exception", exception.message.toString())
             }
 
-            threads.first().folder
+            return@getOrElse (threads.firstOrNull { it.folder.id == folderId } ?: threads.first()).folder
         }
 
     inline val sender get() = from.firstOrNull()