Merge pull request #5745 from kikoso/fix/5665-quoted-message-disappearing

fix: quoted message disappearing after editing a reply (#5665)

Author: mahibi

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

@@ -4306,7 +4306,7 @@ class ChatActivity :
         messageTemp.message = newString
 
         val index = adapter?.getMessagePositionById(messageTemp.id)!!
-        if (index > 0) {
+        if (index >= 0) {
             val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage
             messageTemp.parentMessageId = adapterMsg.parentMessageId
         }

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

@@ -696,6 +696,14 @@ class OfflineFirstChatRepository @Inject constructor(
                     messageJson.parentMessage?.let { parentMessageJson ->
                         parentMessageJson.message?.let {
                             val parentMessageEntity = parentMessageJson.asEntity(currentUser.id!!)
+
+                            // Preserve parentMessageId if missing in server response but present in local DB
+                            val existingEntity =
+                                chatDao.getChatMessageEntity(internalConversationId, parentMessageJson.id)
+                            if (existingEntity != null && parentMessageEntity.parentMessageId == null) {
+                                parentMessageEntity.parentMessageId = existingEntity.parentMessageId
+                            }
+
                             chatDao.upsertChatMessage(parentMessageEntity)
                             _updateMessageFlow.emit(parentMessageEntity.asModel())
                         }

app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt

@@ -89,6 +89,16 @@ interface ChatMessagesDao {
     )
     fun getChatMessageForConversation(internalConversationId: String, messageId: Long): Flow<ChatMessageEntity>
 
+    @Query(
+        """
+        SELECT * 
+        FROM ChatMessages
+        WHERE internalConversationId = :internalConversationId 
+        AND id = :messageId
+        """
+    )
+    suspend fun getChatMessageEntity(internalConversationId: String, messageId: Long): ChatMessageEntity?
+
     @Query(
         value = """
             DELETE FROM ChatMessages

app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt

@@ -51,6 +51,11 @@ class DummyChatMessagesDaoImpl : ChatMessagesDao {
         messageId: Long
     ): Flow<ChatMessageEntity> = flowOf()
 
+    override suspend fun getChatMessageEntity(
+        internalConversationId: String,
+        messageId: Long
+    ): ChatMessageEntity? = null
+
     override fun deleteChatMessages(internalIds: List<String>) { /* */ }
 
     override fun deleteTempChatMessages(internalConversationId: String, referenceIds: List<String>) { /* */ }