Use a non-nullable boolean, and move back the check in openThread()

Author: KevinBoulongne

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

@@ -352,20 +352,15 @@ 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()
                 return@observe
             }
 
-            if (threadState.shouldMarkThreadAsSeen == true) {
-                threadState.shouldMarkThreadAsSeen = false
-                markThreadAsSeen(thread)
-            }
-
             binding.iconFavorite.apply {
                 setIconResource(if (thread.isFavorite) R.drawable.ic_star_filled else R.drawable.ic_star)
                 val color = if (thread.isFavorite) {

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? = null
+    var hasBeenMarkedAsSeen: Boolean = false
     var superCollapsedBlock: SuperCollapsedBlock? = null
 
     fun reset() {
@@ -48,7 +48,7 @@ class ThreadState {
         isCalendarEventExpandedMap.clear()
         treatedMessagesForCalendarEvent.clear()
         cachedSplitBodies.clear()
-        shouldMarkThreadAsSeen = null
+        hasBeenMarkedAsSeen = false
         superCollapsedBlock = null
     }
 }

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

@@ -255,12 +255,15 @@ class ThreadViewModel @Inject constructor(
             }
         }
 
-        if (threadState.shouldMarkThreadAsSeen == null) threadState.shouldMarkThreadAsSeen = thread.unseenMessagesCount > 0
+        if (!threadState.hasBeenMarkedAsSeen) {
+            threadState.hasBeenMarkedAsSeen = true
+            if (thread.unseenMessagesCount > 0) markThreadAsSeen(thread)
+        }
 
         emit(thread)
     }
 
-    fun markThreadAsSeen(thread: Thread) = viewModelScope.launch(ioCoroutineContext) {
+    private fun markThreadAsSeen(thread: Thread) = viewModelScope.launch(ioCoroutineContext) {
         sharedUtils.markAsSeen(mailbox, listOf(thread))
     }