Merge pull request #1733 from Infomaniak/fix-read

Opening a Thread now correctly marks it as read
Infomaniak · Mar 4, 2024 · dc33ec2 · dc33ec2
2 parents 401fbca + 390a3cd
commit dc33ec2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -352,9 +352,9 @@ class ThreadFragment : Fragment() {
         mainViewModel.toggleLightThemeForMessage.observe(viewLifecycleOwner, threadAdapter::toggleLightMode)
     }
 
-    private fun observeThreadLive() = with(threadViewModel) {
+    private fun observeThreadLive() {
 
-        threadLive.observe(viewLifecycleOwner) { thread ->
+        threadViewModel.threadLive.observe(viewLifecycleOwner) { thread ->
 
             if (thread == null) {
                 twoPaneViewModel.closeThread()
@@ -378,11 +378,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()

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadState.kt b/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 hasBeenMarkedAsSeen: Boolean = false
     var superCollapsedBlock: SuperCollapsedBlock? = null
 
     fun reset() {
@@ -48,7 +48,7 @@ class ThreadState {
         isCalendarEventExpandedMap.clear()
         treatedMessagesForCalendarEvent.clear()
         cachedSplitBodies.clear()
-        shouldMarkThreadAsSeen = false
+        hasBeenMarkedAsSeen = false
         superCollapsedBlock = null
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadViewModel.kt
@@ -255,13 +255,16 @@ class ThreadViewModel @Inject constructor(
             }
         }
 
-        threadState.shouldMarkThreadAsSeen = thread.unseenMessagesCount > 0
+        if (!threadState.hasBeenMarkedAsSeen) {
+            threadState.hasBeenMarkedAsSeen = true
+            if (thread.unseenMessagesCount > 0) markThreadAsSeen(thread)
+        }
 
         emit(thread)
     }
 
-    fun markThreadAsSeen() = viewModelScope.launch(ioCoroutineContext) {
-        threadLive.value?.let { sharedUtils.markAsSeen(mailbox, listOf(it)) }
+    private fun markThreadAsSeen(thread: Thread) = viewModelScope.launch(ioCoroutineContext) {
+        sharedUtils.markAsSeen(mailbox, listOf(thread))
     }
 
     private fun sendMatomoAndSentryAboutThreadMessagesCount(thread: Thread) {