Opening a Thread now correctly marks it as read

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt

@@ -359,6 +359,11 @@ class ThreadFragment : Fragment() {
                 return@observe
             }
 
+            if (threadState.shouldMarkThreadAsSeen == true) {
+                threadState.shouldMarkThreadAsSeen = false
+                markThreadAsSeen(thread)
+            }
+
             binding.threadSubject.movementMethod = LinkMovementMethod.getInstance()
 
             binding.iconFavorite.apply {
@@ -378,11 +383,6 @@ class ThreadFragment : Fragment() {
         messagesLive.observe(viewLifecycleOwner) { (items, messagesToFetch) ->
             SentryLog.i("UI", "Received ${items.count()} messages")
 
-            if (threadState.shouldMarkThreadAsSeen) {
-                threadState.shouldMarkThreadAsSeen = false
-                markThreadAsSeen()
-            }
-
             if (items.isEmpty()) {
                 mainViewModel.deletedMessages.value = deletedMessagesUids
                 twoPaneViewModel.closeThread()

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadState.kt

@@ -37,7 +37,7 @@ class ThreadState {
     val isCalendarEventExpandedMap: MutableMap<String, Boolean> = mutableMapOf()
     val treatedMessagesForCalendarEvent: MutableSet<String> = mutableSetOf()
     val cachedSplitBodies: MutableMap<String, SplitBody> = mutableMapOf()
-    var shouldMarkThreadAsSeen: Boolean = false
+    var shouldMarkThreadAsSeen: Boolean? = null
     var superCollapsedBlock: SuperCollapsedBlock? = null
 
     fun reset() {
@@ -48,7 +48,7 @@ class ThreadState {
         isCalendarEventExpandedMap.clear()
         treatedMessagesForCalendarEvent.clear()
         cachedSplitBodies.clear()
-        shouldMarkThreadAsSeen = false
+        shouldMarkThreadAsSeen = null
         superCollapsedBlock = null
     }
 }

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadViewModel.kt

@@ -255,13 +255,13 @@ class ThreadViewModel @Inject constructor(
             }
         }
 
-        threadState.shouldMarkThreadAsSeen = thread.unseenMessagesCount > 0
+        if (threadState.shouldMarkThreadAsSeen == null) threadState.shouldMarkThreadAsSeen = thread.unseenMessagesCount > 0
 
         emit(thread)
     }
 
-    fun markThreadAsSeen() = viewModelScope.launch(ioCoroutineContext) {
-        threadLive.value?.let { sharedUtils.markAsSeen(mailbox, listOf(it)) }
+    fun markThreadAsSeen(thread: Thread) = viewModelScope.launch(ioCoroutineContext) {
+        sharedUtils.markAsSeen(mailbox, listOf(thread))
     }
 
     private fun sendMatomoAndSentryAboutThreadMessagesCount(thread: Thread) {