remove composite message preview mapping

wireapp · Jul 18, 2023 · 772dadc · 772dadc
1 parent f477546
commit 772dadc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
@@ -340,7 +340,7 @@ sealed interface MessagePreviewContent {
     sealed interface WithUser : MessagePreviewContent {
         val username: String?
 
-        data class Text(override val username: String?, val messageBody: String?) : WithUser
+        data class Text(override val username: String?, val messageBody: String) : WithUser
 
         data class Asset(override val username: String?, val type: AssetType) : WithUser
 

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
@@ -218,8 +218,6 @@ class MessageMapperImpl(
             )
         }
         return when (message.contentType) {
-
-            MessageEntity.ContentType.COMPOSITE,
             MessageEntity.ContentType.TEXT -> LocalNotificationMessage.Text(
                 author = sender,
                 text = message.text.orEmpty(),
@@ -263,6 +261,7 @@ class MessageMapperImpl(
             MessageEntity.ContentType.CONVERSATION_MESSAGE_TIMER_CHANGED -> null
             MessageEntity.ContentType.CONVERSATION_CREATED -> null
             MessageEntity.ContentType.MLS_WRONG_EPOCH_WARNING -> null
+            MessageEntity.ContentType.COMPOSITE -> null
         }
     }
 

diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
@@ -351,7 +351,7 @@ data class NotificationMessageEntity(
 
 sealed class MessagePreviewEntityContent {
 
-    data class Text(val senderName: String?, val messageBody: String?) : MessagePreviewEntityContent()
+    data class Text(val senderName: String?, val messageBody: String) : MessagePreviewEntityContent()
 
     data class Asset(val senderName: String?, val type: AssetTypeEntity) : MessagePreviewEntityContent()
 

diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
@@ -178,13 +178,6 @@ object MessageMapper {
 
             MessageEntity.ContentType.REMOVED_FROM_TEAM -> MessagePreviewEntityContent.TeamMemberRemoved(userName = senderName)
 
-            MessageEntity.ContentType.COMPOSITE -> MessagePreviewEntityContent.Text(
-                senderName = senderName,
-                // composite messages can have no text since they are just a collection of Text and Buttons
-                // so if the collection have no text we just set it is null therefore no need to require it
-                messageBody = text
-            )
-
             MessageEntity.ContentType.NEW_CONVERSATION_RECEIPT_MODE -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.CONVERSATION_RECEIPT_MODE_CHANGED -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.HISTORY_LOST -> MessagePreviewEntityContent.Unknown
@@ -193,6 +186,7 @@ object MessageMapper {
             MessageEntity.ContentType.MLS_WRONG_EPOCH_WARNING -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.UNKNOWN -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.FAILED_DECRYPTION -> MessagePreviewEntityContent.Unknown
+            MessageEntity.ContentType.COMPOSITE -> MessagePreviewEntityContent.Unknown
             MessageEntity.ContentType.CRYPTO_SESSION_RESET -> MessagePreviewEntityContent.CryptoSessionReset
         }
     }