fix: fix bug not displaying asset messages correctly

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationViewModel.kt

@@ -264,20 +264,15 @@ class ConversationViewModel @Inject constructor(
         }
     }
 
-    private suspend fun fromMessageModelToMessageContent(message: Message): MessageContent =
+    private suspend fun fromMessageModelToMessageContent(message: Message): MessageContent? =
         when (val content = message.content) {
             is Asset -> mapToMessageUI(content.value, message.conversationId, message.id)
             is Text -> TextMessage(messageBody = MessageBody(content.value))
             else -> TextMessage(messageBody = MessageBody((content as? Text)?.value ?: "content is not available"))
         }
 
-    private suspend fun mapToMessageUI(assetContent: AssetContent, conversationId: ConversationId, messageId: String): MessageContent {
+    private suspend fun mapToMessageUI(assetContent: AssetContent, conversationId: ConversationId, messageId: String): MessageContent? {
         with(assetContent) {
-            val assetId = remoteData.assetId
-
-            // TODO: To be changed once the error behavior has been defined with product
-            if (assetId.isEmpty()) return TextMessage(messageBody = MessageBody("The asset message could not be downloaded correctly"))
-
             val (imgWidth, imgHeight) = when (val md = metadata) {
                 is Image -> md.width to md.height
                 else -> 0 to 0
@@ -287,12 +282,17 @@ class ConversationViewModel @Inject constructor(
                 mimeType.contains("image") -> ImageMessage(getRawAssetData(conversationId, messageId), width = imgWidth, height = imgHeight)
 
                 // It's a generic Asset Message so let's not download it yet
-                else -> AssetMessage(
-                    assetName = name ?: "",
-                    assetExtension = name?.split(".")?.last() ?: "",
-                    assetId = remoteData.assetId,
-                    assetSizeInBytes = sizeInBytes
-                )
+                else -> {
+                    return if (remoteData.assetId.isNotEmpty()) {
+                        AssetMessage(
+                            assetName = name ?: "",
+                            assetExtension = name?.split(".")?.last() ?: "",
+                            assetId = remoteData.assetId,
+                            assetSizeInBytes = sizeInBytes
+                        )
+                        // On the first asset message received, the asset ID is null, so we filter it out until the second updates it
+                    } else null
+                }
             }
         }
     }

app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt

@@ -20,12 +20,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.wire.android.ui.common.LegalHoldIndicator
 import com.wire.android.ui.common.MembershipQualifierLabel
 import com.wire.android.ui.common.UserProfileAvatar
-import com.wire.android.ui.home.conversations.mock.mockMessageWithText
 import com.wire.android.ui.home.conversations.model.ImageMessageParams
 import com.wire.android.ui.home.conversations.model.MessageAsset
 import com.wire.android.ui.home.conversations.model.MessageBody
@@ -129,7 +127,7 @@ private fun Username(username: String) {
 }
 
 @Composable
-private fun MessageContent(messageContent: MessageContent, onAssetClick: (String) -> Unit) {
+private fun MessageContent(messageContent: MessageContent?, onAssetClick: (String) -> Unit) {
     when (messageContent) {
         is MessageContent.ImageMessage -> MessageImage(
             rawImgData = messageContent.rawImgData,
@@ -142,6 +140,7 @@ private fun MessageContent(messageContent: MessageContent, onAssetClick: (String
             assetSizeInBytes = messageContent.assetSizeInBytes,
             onAssetClick = { onAssetClick(messageContent.assetId) }
         )
+        else -> {}
     }
 }
 

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageViewWrapper.kt

@@ -9,7 +9,7 @@ data class MessageViewWrapper(
     val user: User,
     val messageSource: MessageSource = MessageSource.CurrentUser,
     val messageHeader: MessageHeader,
-    val messageContent: MessageContent,
+    val messageContent: MessageContent?,
 ) {
     val isDeleted: Boolean = messageHeader.messageStatus == MessageStatus.Deleted
 }