feat: clear orphaned events on navigation

wireapp · Oct 11, 2023 · 503cccf · 503cccf
1 parent e0279f3
commit 503cccf
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...n/kotlin/com/wire/android/ui/home/conversations/messages/ConversationMessagesViewModel.kt b/...n/kotlin/com/wire/android/ui/home/conversations/messages/ConversationMessagesViewModel.kt
@@ -52,6 +52,7 @@ import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.feature.asset.GetMessageAssetUseCase
 import com.wire.kalium.logic.feature.asset.MessageAssetResult
 import com.wire.kalium.logic.feature.asset.UpdateAssetMessageDownloadStatusUseCase
+import com.wire.kalium.logic.feature.conversation.ClearUsersTypingEventsUseCase
 import com.wire.kalium.logic.feature.conversation.GetConversationUnreadEventsCountUseCase
 import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
 import com.wire.kalium.logic.feature.message.GetMessageByIdUseCase
@@ -83,7 +84,8 @@ class ConversationMessagesViewModel @Inject constructor(
     private val toggleReaction: ToggleReactionUseCase,
     private val resetSession: ResetSessionUseCase,
     private val conversationAudioMessagePlayer: ConversationAudioMessagePlayer,
-    private val getConversationUnreadEventsCount: GetConversationUnreadEventsCountUseCase
+    private val getConversationUnreadEventsCount: GetConversationUnreadEventsCountUseCase,
+    private val clearUsersTypingEvents: ClearUsersTypingEventsUseCase
 ) : SavedStateViewModel(savedStateHandle) {
 
     private val conversationNavArgs: ConversationNavArgs = savedStateHandle.navArgs()
@@ -97,11 +99,16 @@ class ConversationMessagesViewModel @Inject constructor(
     val infoMessage = _infoMessage.asSharedFlow()
 
     init {
+        clearOrphanedTypingEvents()
         loadPaginatedMessages()
         loadLastMessageInstant()
         observeAudioPlayerState()
     }
 
+    private fun clearOrphanedTypingEvents() {
+        viewModelScope.launch { clearUsersTypingEvents() }
+    }
+
     private fun observeAudioPlayerState() {
         viewModelScope.launch {
             conversationAudioMessagePlayer.observableAudioMessagesState.collect {