"Delete All Messages" now works without breaking the initMessagePolling

Signed-off-by: rapterjet2004 <[email protected]>
nextcloud · Aug 29, 2024 · 10e2d32 · 10e2d32
1 parent 5440b84
commit 10e2d32
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -323,6 +323,7 @@ class ChatActivity :
 
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
+            chatViewModel.handleChatOnBackPress()
             if (currentlyPlayedVoiceMessage != null) {
                 stopMediaPlayer(currentlyPlayedVoiceMessage!!)
             }
@@ -2699,7 +2700,7 @@ class ChatActivity :
             withUrl = urlForChatting,
             withCredentials = credentials!!,
             withMessageLimit = MESSAGE_PULL_LIMIT,
-            roomToken = currentConversation!!.token!!
+            roomToken = currentConversation!!.token
         )
     }
 

diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt
@@ -63,4 +63,9 @@ interface ChatMessageRepository : LifecycleAwareManager {
      * Gets a individual message.
      */
     suspend fun getMessage(messageId: Long, bundle: Bundle): Flow<ChatMessage>
+
+    /**
+     * Destroys unused resources.
+     */
+    fun handleChatOnBackPress()
 }
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
@@ -31,6 +31,7 @@ import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -184,8 +185,8 @@ class OfflineFirstChatRepository @Inject constructor(
 
             val networkParams = Bundle()
 
-            while (!itIsPaused) {
-                if (!monitor.isOnline.first()) Thread.sleep(500)
+            while (true) {
+                if (!monitor.isOnline.first() || itIsPaused) Thread.sleep(500)
 
                 // sync database with server (This is a long blocking call because long polling (lookIntoFuture) is set)
                 networkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap)
@@ -609,6 +610,10 @@ class OfflineFirstChatRepository @Inject constructor(
         // unused atm
     }
 
+    override fun handleChatOnBackPress() {
+        scope.cancel()
+    }
+
     companion object {
         val TAG = OfflineFirstChatRepository::class.simpleName
         private const val HTTP_CODE_OK: Int = 200

diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
@@ -624,6 +624,10 @@ class ChatViewModel @Inject constructor(
         _getCapabilitiesViewState.value = GetCapabilitiesStartState
     }
 
+    fun handleChatOnBackPress() {
+        chatRepository.handleChatOnBackPress()
+    }
+
     suspend fun getMessageById(url: String, conversationModel: ConversationModel, messageId: Long): Flow<ChatMessage> =
         flow {
             val bundle = Bundle()
@@ -632,7 +636,7 @@ class ChatViewModel @Inject constructor(
                 BundleKeys.KEY_CREDENTIALS,
                 userProvider.currentUser.blockingGet().getCredentials()
             )
-            bundle.putString(BundleKeys.KEY_ROOM_TOKEN, conversationModel.token!!)
+            bundle.putString(BundleKeys.KEY_ROOM_TOKEN, conversationModel.token)
 
             val message = chatRepository.getMessage(messageId, bundle)
             emit(message.first())