WIP

Author: KevinBoulongne

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

@@ -147,7 +147,7 @@ class ThreadFragment : Fragment() {
         observeLightThemeToggle()
         observeThreadLive()
         observeMessagesLive()
-        observeBatchedMessages()
+        observeMessagesLive2()
         observeFailedMessages()
         observeQuickActionBarClicks()
         observeSubjectUpdateTriggers()
@@ -432,7 +432,7 @@ class ThreadFragment : Fragment() {
             if (threadState.hasSuperCollapsedBlockBeenClicked) {
                 displayBatchedMessages(items)
             } else {
-                threadAdapter.submitList(items)
+                messagesLive2.value = items
             }
 
             if (messagesToFetch.isNotEmpty()) fetchMessagesHeavyData(messagesToFetch)
@@ -441,8 +441,8 @@ class ThreadFragment : Fragment() {
         }
     }
 
-    private fun observeBatchedMessages() {
-        threadViewModel.batchedMessages.observe(viewLifecycleOwner, threadAdapter::submitList)
+    private fun observeMessagesLive2() {
+        threadViewModel.messagesLive2.observe(viewLifecycleOwner, threadAdapter::submitList)
     }
 
     private fun observeFailedMessages() {

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

@@ -74,7 +74,7 @@ class ThreadViewModel @Inject constructor(
 
     val threadLive = MutableLiveData<Thread?>()
     val messagesLive = MutableLiveData<Pair<ThreadAdapterItems, MessagesWithoutHeavyData>>()
-    val batchedMessages = SingleLiveEvent<List<Any>>()
+    val messagesLive2 = SingleLiveEvent<List<Any>>()
 
     val quickActionBarClicks = SingleLiveEvent<QuickActionBarResult>()
 
@@ -256,7 +256,7 @@ class ThreadViewModel @Inject constructor(
 
             // We need to post a different list each time, because the `submitList` function in AsyncListDiffer
             // won't trigger if we send the same list object (https://stackoverflow.com/questions/49726385).
-            batchedMessages.postValue(ArrayList(output))
+            messagesLive2.postValue(ArrayList(output))
 
             if (batch.size < batchSize) return
             delay(DELAY_BETWEEN_EACH_BATCHED_MESSAGES)