Merge pull request #6592 from nextcloud/bugfix/noid/fixNpeForGetMessage

Bugfix/noid/fix npe for get message

Author: mahibi

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

@@ -448,7 +448,7 @@ class OfflineFirstChatRepository @Inject constructor(
                 return@flow
             }
 
-            getAndPersistMessages(bundle)
+            fetchAndPersistSingleMessage(messageId)
 
             emitAll(
                 observeMessageNonNull(internalConversationId, messageId)
@@ -457,6 +457,18 @@ class OfflineFirstChatRepository @Inject constructor(
             )
         }
 
+    private suspend fun fetchAndPersistSingleMessage(messageId: Long) {
+        val messages = network.getContextForChatMessage(
+            credentials = credentials,
+            baseUrl = currentUser.baseUrl!!,
+            token = roomToken,
+            messageId = messageId.toString(),
+            limit = 1,
+            threadId = threadId?.toInt()
+        )
+        persistChatMessagesAndHandleSystemMessages(messages)
+    }
+
     @Suppress("Detekt.TooGenericExceptionCaught")
     override suspend fun loadMessageContext(
         messageId: Long,
@@ -542,8 +554,12 @@ class OfflineFirstChatRepository @Inject constructor(
         }
     }
 
+    // Callers must put a KEY_FIELD_MAP (see getFieldMap/syncer.buildFieldMap) into bundle before
+    // calling this.
     private suspend fun getAndPersistMessages(bundle: Bundle): Boolean {
-        val fieldMap = bundle.getSerializable(BundleKeys.KEY_FIELD_MAP) as HashMap<String, Int>
+        val fieldMap = requireNotNull(bundle.getSerializable(BundleKeys.KEY_FIELD_MAP) as? HashMap<String, Int>) {
+            "getAndPersistMessages requires bundle to carry KEY_FIELD_MAP"
+        }
         val outcome = syncer.pullAndPersistMessages(syncTarget, fieldMap, syncEvents)
         return outcome.persistedNewMessages
     }