handle loading of initial messages depending on HPB existence

Signed-off-by: Marcel Hibbe <[email protected]>

Author: mahibi

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

@@ -830,7 +830,9 @@ class ChatActivity :
 
                         chatViewModel.loadMessages(
                             withCredentials = credentials!!,
-                            withUrl = urlForChatting
+                            withUrl = urlForChatting,
+                            hasHighPerformanceBackend =
+                            WebSocketConnectionHelper.getWebSocketInstanceForUser(conversationUser) != null
                         )
                     } else {
                         Log.w(
@@ -1042,7 +1044,6 @@ class ChatActivity :
             }
             .launchIn(lifecycleScope)
 
-
         this.lifecycleScope.launch {
             chatViewModel.getRemoveMessageFlow
                 .onEach {
@@ -2764,6 +2765,10 @@ class ChatActivity :
         if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
             mentionAutocomplete?.dismissPopup()
         }
+
+        // TODO: when updating remote last read message in onPause, there is a race condition with loading conversations
+        // for conversation list. It may or may not include info about the sent last read message...
+        // -> save this field offline in conversation?
         updateRemoteLastReadMessageIfNeeded()
 
         adapter = null
@@ -2920,6 +2925,7 @@ class ChatActivity :
 
     private fun setupWebsocket() {
         if (currentConversation == null || conversationUser == null) {
+            Log.e(TAG, "setupWebsocket: currentConversation or conversationUser is null")
             return
         }
 

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

@@ -50,7 +50,7 @@ interface ChatMessageRepository : LifecycleAwareManager {
 
     fun updateConversation(conversationModel: ConversationModel)
 
-    fun initScopeAndLoadInitialMessages(withNetworkParams: Bundle)
+    fun initScopeAndLoadInitialMessages(withNetworkParams: Bundle, hasHighPerformanceBackend: Boolean)
 
     /**
      * Loads messages from local storage. If the messages are not found, then it

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

@@ -140,12 +140,15 @@ class OfflineFirstChatRepository @Inject constructor(
         this.conversationModel = conversationModel
     }
 
-    override fun initScopeAndLoadInitialMessages(withNetworkParams: Bundle) {
+    override fun initScopeAndLoadInitialMessages(withNetworkParams: Bundle, hasHighPerformanceBackend: Boolean) {
         scope = CoroutineScope(Dispatchers.IO)
-        loadInitialMessages(withNetworkParams)
+        loadInitialMessages(
+            withNetworkParams,
+            hasHighPerformanceBackend
+        )
     }
 
-    private fun loadInitialMessages(withNetworkParams: Bundle): Job =
+    private fun loadInitialMessages(withNetworkParams: Bundle, hasHighPerformanceBackend: Boolean): Job =
         scope.launch {
             Log.d(TAG, "---- loadInitialMessages ------------")
             newXChatLastCommonRead = conversationModel.lastCommonReadMessage
@@ -161,19 +164,27 @@ class OfflineFirstChatRepository @Inject constructor(
             val weHaveAtLeastTheLastReadMessage = newestMessageIdFromDb >= conversationModel.lastReadMessage.toLong()
             Log.d(TAG, "weAlreadyHaveSomeOfflineMessages:$weAlreadyHaveSomeOfflineMessages")
             Log.d(TAG, "weHaveAtLeastTheLastReadMessage:$weHaveAtLeastTheLastReadMessage")
+            Log.d(TAG, "hasHighPerformanceBackend:$hasHighPerformanceBackend")
 
-            if (weAlreadyHaveSomeOfflineMessages && weHaveAtLeastTheLastReadMessage) {
+            if (weAlreadyHaveSomeOfflineMessages && weHaveAtLeastTheLastReadMessage && !hasHighPerformanceBackend) {
                 Log.d(
                     TAG,
                     "Initial online request is skipped because offline messages are up to date" +
                         " until lastReadMessage"
                 )
 
-                // This is a problem! No long polling should be done when we have the HPB. How to initially get the
-                // messages newer than TheLastReadMessage?
-                Log.d(TAG, "For messages newer than lastRead, lookIntoFuture will load them.")
+                // For messages newer than lastRead, lookIntoFuture will load them.
+                // We must only end up here when NO HPB is used!
+                // If a HPB is used, longPolling is not available to handle loading of newer messages.
+                // When a HPB is used the initial request must be made.
             } else {
-                if (!weAlreadyHaveSomeOfflineMessages) {
+                if (hasHighPerformanceBackend) {
+                    Log.d(
+                        TAG,
+                        "An online request for newest 100 messages is made because HPB is used (No long " +
+                            "polling available to catch up with messages newer than last read.)"
+                    )
+                } else if (!weAlreadyHaveSomeOfflineMessages) {
                     Log.d(TAG, "An online request for newest 100 messages is made because offline chat is empty")
                     if (networkMonitor.isOnline.value.not()) {
                         _generalUIFlow.emit(ChatActivity.NO_OFFLINE_MESSAGES_FOUND)
@@ -208,8 +219,9 @@ class OfflineFirstChatRepository @Inject constructor(
 
             handleMessagesFromDb(newestMessageIdFromDb)
 
-            // temp disabled to test only signaling
-            // initMessagePolling(newestMessageIdFromDb)
+            if (!hasHighPerformanceBackend) {
+                initMessagePolling(newestMessageIdFromDb)
+            }
         }
 
     private suspend fun handleMessagesFromDb(newestMessageIdFromDb: Long) {

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

@@ -508,12 +508,13 @@ class ChatViewModel @Inject constructor(
         }
     }
 
-    fun loadMessages(withCredentials: String, withUrl: String) {
+    fun loadMessages(withCredentials: String, withUrl: String, hasHighPerformanceBackend: Boolean) {
         val bundle = Bundle()
         bundle.putString(BundleKeys.KEY_CHAT_URL, withUrl)
         bundle.putString(BundleKeys.KEY_CREDENTIALS, withCredentials)
         chatRepository.initScopeAndLoadInitialMessages(
-            withNetworkParams = bundle
+            withNetworkParams = bundle,
+            hasHighPerformanceBackend = hasHighPerformanceBackend
         )
     }