re add insurance call

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

Author: mahibi

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

@@ -122,6 +122,8 @@ class OfflineFirstChatRepository @Inject constructor(
     private lateinit var urlForChatting: String
     private var threadId: Long? = null
 
+    private var latestKnownMessageIdFromSync: Long = 0
+
     override fun initData(
         currentUser: User,
         credentials: String,
@@ -220,7 +222,7 @@ class OfflineFirstChatRepository @Inject constructor(
             if (!hasHighPerformanceBackend) {
                 initLongPolling(newestMessageIdFromDb)
             } else {
-                // initRepeatingInsuranceRequest(newestMessageIdFromDb)
+                initRepeatingInsuranceRequest()
             }
         }
 
@@ -377,33 +379,30 @@ class OfflineFirstChatRepository @Inject constructor(
             }
         }
 
-    private fun initRepeatingInsuranceRequest(initialMessageId: Long) {
+    private fun initRepeatingInsuranceRequest() {
         scope.launch {
             Log.d(TAG, "---- initRepeatingInsuranceRequest ------------")
 
-            Log.d(TAG, "newestMessage: $initialMessageId")
-
             var showUnreadMessagesMarker = true
 
-            // the message id we know from the initial request or last insurance request. NOT any message id from signaling received messages)
-            var lastKnownMessageIdFromInsuranceRequest = initialMessageId.toInt()
+            delay(INSURANCE_REQUEST_DELAY)
 
             while (isActive) {
-                Log.d(TAG, "lastKnownMessageIdFromInsuranceRequest: $lastKnownMessageIdFromInsuranceRequest")
+                Log.d(TAG, "latestKnownMessageIdFromSync: $latestKnownMessageIdFromSync")
 
                 var fieldMap = getFieldMap(
                     lookIntoFuture = true,
                     timeout = 0,
                     includeLastKnown = false,
-                    lastKnown = lastKnownMessageIdFromInsuranceRequest,
+                    lastKnown = latestKnownMessageIdFromSync.toInt(),
                     limit = 200
                 )
                 val networkParams = Bundle()
                 networkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap)
 
                 getAndPersistMessages(networkParams)
 
-                delay(1 * 60 * 1000)
+                delay(INSURANCE_REQUEST_DELAY)
             }
         }
     }
@@ -645,11 +644,15 @@ class OfflineFirstChatRepository @Inject constructor(
             it.asEntity(currentUser.id!!)
         }
 
+        chatDao.upsertChatMessages(chatMessagesFromSyncToProcess)
+
         val oldestIdFromSync = chatMessagesFromSyncToProcess.minByOrNull { it.id }!!.id
         val newestIdFromSync = chatMessagesFromSyncToProcess.maxByOrNull { it.id }!!.id
         Log.d(TAG, "oldestIdFromSync: $oldestIdFromSync")
         Log.d(TAG, "newestIdFromSync: $newestIdFromSync")
 
+        latestKnownMessageIdFromSync = maxOf(latestKnownMessageIdFromSync, newestIdFromSync)
+
         var oldestMessageIdForNewChatBlock = oldestIdFromSync
         var newestMessageIdForNewChatBlock = newestIdFromSync
 
@@ -679,8 +682,6 @@ class OfflineFirstChatRepository @Inject constructor(
         )
         chatBlocksDao.upsertChatBlock(newChatBlock)
         updateBlocks(newChatBlock)
-
-        chatDao.upsertChatMessages(chatMessagesFromSyncToProcess)
     }
 
     private suspend fun handleUpdateMessages(messagesJson: List<ChatMessageJson>) {
@@ -1064,11 +1065,12 @@ class OfflineFirstChatRepository @Inject constructor(
         }
 
         scope.launch {
-            updateNewestChatBlockWithNewLatestMessageId(chatMessage.id)
-
             val chatMessageEntity = chatMessage.asEntity(currentUser.id!!)
             chatDao.upsertChatMessages(listOf(chatMessageEntity))
+
+            updateNewestChatBlockWithNewLatestMessageId(chatMessage.id)
         }
+
     }
 
     override fun observeMessages(
@@ -1176,6 +1178,7 @@ class OfflineFirstChatRepository @Inject constructor(
         private const val HALF_SECOND = 500L
         private const val DELAY_TO_ENSURE_MESSAGES_ARE_ADDED: Long = 100
         private const val DEFAULT_MESSAGES_LIMIT = 100
-        private const val MILLIES = 1000
+        private const val MILLIES = 1000L
+        private const val INSURANCE_REQUEST_DELAY = 1 * 60 * MILLIES
     }
 }