show chat messages from signaling (temp. disabled longpolling for now)

known issues:
mark chat as read not working (have to use separate endpoint to mark as read)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -477,7 +477,9 @@ class ChatActivity :
             }
         }
 
-        override fun onMessageReceived(chatMessage: ChatMessageJson?) {
+        override fun onChatMessageReceived(chatMessage: ChatMessageJson) {
+            chatViewModel.onSignalingChatMessageReceived(chatMessage)
+
             Log.d(
                 TAG,
                 "received message in ChatActivity. This is the chat message received via HPB. It would be " +

app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt

@@ -11,6 +11,7 @@ import android.os.Bundle
 import com.nextcloud.talk.chat.data.io.LifecycleAwareManager
 import com.nextcloud.talk.chat.data.model.ChatMessage
 import com.nextcloud.talk.models.domain.ConversationModel
+import com.nextcloud.talk.models.json.chat.ChatMessageJson
 import com.nextcloud.talk.models.json.chat.ChatOverallSingleMessage
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
@@ -116,4 +117,6 @@ interface ChatMessageRepository : LifecycleAwareManager {
     suspend fun sendUnsentChatMessages(credentials: String, url: String)
 
     suspend fun deleteTempMessage(chatMessage: ChatMessage)
+
+    fun onSignalingChatMessageReceived(chatMessage: ChatMessageJson)
 }

app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt

@@ -50,6 +50,8 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.IOException
 import javax.inject.Inject
+import kotlin.collections.any
+import kotlin.collections.map
 
 @Suppress("LargeClass", "TooManyFunctions")
 class OfflineFirstChatRepository @Inject constructor(
@@ -197,7 +199,8 @@ class OfflineFirstChatRepository @Inject constructor(
 
             handleMessagesFromDb(newestMessageIdFromDb)
 
-            initMessagePolling(newestMessageIdFromDb)
+            // temp disabled to test only signaling
+            // initMessagePolling(newestMessageIdFromDb)
         }
 
     private suspend fun handleMessagesFromDb(newestMessageIdFromDb: Long) {
@@ -349,6 +352,9 @@ class OfflineFirstChatRepository @Inject constructor(
 
                     updateUiForLastCommonRead()
 
+                    // getNewestMessageIdFromChatBlocks wont work for insurance calls. we dont want newest message
+                    // but only the newest message that came from sync (not from signaling)
+                    // -> create new var to save newest message from sync (set for initial and long polling requests)
                     val newestMessage = chatBlocksDao.getNewestMessageIdFromChatBlocks(
                         internalConversationId,
                         threadId
@@ -498,6 +504,7 @@ class OfflineFirstChatRepository @Inject constructor(
             Log.d(TAG, "Starting online request for single message (e.g. a reply)")
             sync(bundle)
         }
+        // we cant just expect here that sync succeeded??
         return chatDao.getChatMessageForConversation(
             internalConversationId,
             messageId
@@ -670,7 +677,7 @@ class OfflineFirstChatRepository @Inject constructor(
             newestMessageId = newestMessageIdForNewChatBlock,
             hasHistory = hasHistory
         )
-        chatBlocksDao.upsertChatBlock(newChatBlock) // crash when no conversation thread exists!
+        chatBlocksDao.upsertChatBlock(newChatBlock)
 
         updateBlocks(newChatBlock)
         return chatMessagesFromSyncToProcess
@@ -1020,6 +1027,27 @@ class OfflineFirstChatRepository @Inject constructor(
         _removeMessageFlow.emit(chatMessage)
     }
 
+    override fun onSignalingChatMessageReceived(chatMessage: ChatMessageJson) {
+        scope.launch {
+            val chatMessageEntities = updateMessagesData(
+                chatMessagesJson = listOf(chatMessage),
+                blockContainingQueriedMessage = null,
+                lookIntoFuture = true,
+                hasHistory = true
+            )
+
+            val chatMessages = chatMessageEntities.map(ChatMessageEntity::asModel)
+
+            handleNewAndTempMessages(
+                receivedChatMessages = chatMessages,
+                lookIntoFuture = true,
+                showUnreadMessagesMarker = false
+            )
+
+            updateUiForLastCommonRead()
+        }
+    }
+
     @Suppress("Detekt.TooGenericExceptionCaught")
     override suspend fun addTemporaryMessage(
         message: CharSequence,

app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt

@@ -35,6 +35,7 @@ import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.domain.ReactionAddedModel
 import com.nextcloud.talk.models.domain.ReactionDeletedModel
 import com.nextcloud.talk.models.json.capabilities.SpreedCapability
+import com.nextcloud.talk.models.json.chat.ChatMessageJson
 import com.nextcloud.talk.models.json.chat.ChatOverallSingleMessage
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.generic.GenericOverall
@@ -131,6 +132,10 @@ class ChatViewModel @Inject constructor(
         mediaPlayerManager.handleOnStop()
     }
 
+    fun onSignalingChatMessageReceived(chatMessage: ChatMessageJson) {
+        chatRepository.onSignalingChatMessageReceived(chatMessage)
+    }
+
     val backgroundPlayUIFlow = mediaPlayerManager.backgroundPlayUIFlow
 
     val mediaPlayerSeekbarObserver: Flow<ChatMessage>

app/src/main/java/com/nextcloud/talk/signaling/ConversationMessageNotifier.kt

@@ -33,7 +33,7 @@ internal class ConversationMessageNotifier {
     @Synchronized
     fun notifyMessageReceived(chatMessage: ChatMessageJson) {
         for (listener in ArrayList(conversationMessageListeners)) {
-            listener.onMessageReceived(chatMessage)
+            listener.onChatMessageReceived(chatMessage)
         }
     }
 

app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.kt

@@ -166,7 +166,7 @@ abstract class SignalingMessageReceiver {
     interface ConversationMessageListener {
         fun onStartTyping(userId: String?, session: String?)
         fun onStopTyping(userId: String?, session: String?)
-        fun onMessageReceived(chatMessage: ChatMessageJson?)
+        fun onChatMessageReceived(chatMessage: ChatMessageJson)
     }
 
     /**