Merge pull request #1708 from Infomaniak/reset-calendar

Reset Calendar data when switching Threads

Author: KevinBoulongne

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

@@ -313,7 +313,7 @@ class ThreadFragment : Fragment() {
 
         twoPaneViewModel.currentThreadUid.distinctUntilChanged().observeNotNull(viewLifecycleOwner) { threadUid ->
 
-            resetMessagesCache()
+            resetMessagesRelatedCache()
             displayThreadView()
 
             openThread(threadUid).observe(viewLifecycleOwner) { result ->

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

@@ -75,16 +75,18 @@ class ThreadViewModel @Inject constructor(
 
     val quickActionBarClicks = SingleLiveEvent<QuickActionBarResult>()
 
+    //region Calendar Events
     private val treatedMessagesForCalendarEvent = mutableSetOf<String>()
     val isCalendarEventExpandedMap = mutableMapOf<String, Boolean>()
+    //endregion
 
     var deletedMessagesUids = mutableSetOf<String>()
     val failedMessagesUids = SingleLiveEvent<List<String>>()
 
     val threadLive = MutableLiveData<Thread?>()
     val messagesLive = MutableLiveData<Pair<ThreadAdapterItems, MessagesWithoutHeavyData>>()
 
-    private var cachedSplitBodies = mutableMapOf<String, SplitBody>()
+    private val cachedSplitBodies = mutableMapOf<String, SplitBody>()
 
     var shouldMarkThreadAsSeen: Boolean = false
 
@@ -97,8 +99,10 @@ class ThreadViewModel @Inject constructor(
         AccountUtils.currentMailboxId,
     ).map { it.obj }.asLiveData(ioCoroutineContext)
 
-    fun resetMessagesCache() {
-        cachedSplitBodies = mutableMapOf()
+    fun resetMessagesRelatedCache() {
+        treatedMessagesForCalendarEvent.clear()
+        isCalendarEventExpandedMap.clear()
+        cachedSplitBodies.clear()
         shouldMarkThreadAsSeen = false
         superCollapsedBlock = null
     }
@@ -394,8 +398,6 @@ class ThreadViewModel @Inject constructor(
         }
     }
 
-    fun getCalendarEventTreatedMessageCount(): Int = treatedMessagesForCalendarEvent.count()
-
     fun replyToCalendarEvent(attendanceState: AttendanceState, message: Message) = liveData(ioCoroutineContext) {
         val calendarEventResponse = message.latestCalendarEventResponse!!