address PR comments

wireapp · Jul 18, 2023 · e3527ae · e3527ae
1 parent da4a856
commit e3527ae
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
@@ -265,11 +265,11 @@ class ProtoContentMapperImpl(
 
             is GenericMessage.Content.ButtonAction -> MessageContent.ButtonAction(
                 buttonId = protoContent.value.buttonId,
-                buttonAction = protoContent.value.referenceMessageId
+                referencedMessageId = protoContent.value.referenceMessageId
             )
 
             is GenericMessage.Content.ButtonActionConfirmation -> MessageContent.ButtonActionConfirmation(
-                referenceMessageId = protoContent.value.referenceMessageId,
+                referencedMessageId = protoContent.value.referenceMessageId,
                 buttonId = protoContent.value.buttonId
             )
 

diff --git a/...wire/kalium/persistence/Messagepreview.sq → ...wire/kalium/persistence/MessagePreview.sq b/...wire/kalium/persistence/Messagepreview.sq → ...wire/kalium/persistence/MessagePreview.sq
diff --git a/...e/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt b/...e/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageInsertExtension.kt
@@ -221,26 +221,7 @@ internal class MessageInsertExtensionImpl(
                 message_timer = content.messageTimer
             )
 
-            is MessageEntityContent.Composite -> {
-                    content.text?.let { text ->
-                        messagesQueries.insertMessageTextContent(
-                            message_id = message.id,
-                            conversation_id = message.conversationId,
-                            text_body = text.messageBody,
-                            quoted_message_id = text.quotedMessageId,
-                            is_quote_verified = text.isQuoteVerified
-                        )
-                    }
-                    content.buttonList.forEach { button ->
-                        buttonContentQueries.insertButton(
-                            message_id = message.id,
-                            conversation_id = message.conversationId,
-                            id = button.id,
-                            text = button.text
-                        )
-                    }
-                }
-
+            is MessageEntityContent.Composite -> insertCompositeMessage(content, message)
             is MessageEntityContent.ConversationCreated,
             is MessageEntityContent.MLSWrongEpochWarning -> {
                 /* no-op */
@@ -335,6 +316,29 @@ internal class MessageInsertExtensionImpl(
         }
     }
 
+    private fun insertCompositeMessage(
+        content: MessageEntityContent.Composite,
+        message: MessageEntity
+    ) {
+        content.text?.let { text ->
+            messagesQueries.insertMessageTextContent(
+                message_id = message.id,
+                conversation_id = message.conversationId,
+                text_body = text.messageBody,
+                quoted_message_id = text.quotedMessageId,
+                is_quote_verified = text.isQuoteVerified
+            )
+        }
+        content.buttonList.forEach { button ->
+            buttonContentQueries.insertButton(
+                message_id = message.id,
+                conversation_id = message.conversationId,
+                id = button.id,
+                text = button.text
+            )
+        }
+    }
+
     @Suppress("ComplexMethod")
     override fun contentTypeOf(content: MessageEntityContent): MessageEntity.ContentType = when (content) {
         is MessageEntityContent.Text -> MessageEntity.ContentType.TEXT