fix: audio messages partial delivery missing [dev] (WPB-4886) (#2284)

Co-authored-by: Yamil Medina <yamilmedina@users.noreply.github.com>
wireapp · Sep 29, 2023 · e1f0bb9 · e1f0bb9
1 parent b5a5ae7
commit e1f0bb9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/mapper/RegularMessageContentMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/RegularMessageContentMapper.kt
@@ -65,7 +65,9 @@ class RegularMessageMapper @Inject constructor(
                 is AssetContent.AssetMetadata.Audio -> {
                     mapAudio(
                         assetContent = content.value,
-                        metadata = metadata
+                        metadata = metadata,
+                        userList = userList,
+                        deliveryStatus = message.deliveryStatus
                     )
                 }
 
@@ -125,6 +127,8 @@ class RegularMessageMapper @Inject constructor(
     private fun mapAudio(
         assetContent: AssetContent,
         metadata: AssetContent.AssetMetadata.Audio,
+        userList: List<User>,
+        deliveryStatus: DeliveryStatus,
     ): UIMessageContent {
         with(assetContent) {
             return UIMessageContent.AudioAssetMessage(
@@ -133,7 +137,8 @@ class RegularMessageMapper @Inject constructor(
                 assetId = AssetId(remoteData.assetId, remoteData.assetDomain.orEmpty()),
                 audioMessageDurationInMs = metadata.durationMs ?: 0,
                 uploadStatus = uploadStatus,
-                downloadStatus = downloadStatus
+                downloadStatus = downloadStatus,
+                deliveryStatus = mapRecipientsFailure(userList, deliveryStatus)
             )
         }
     }

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
@@ -563,23 +563,26 @@ private fun MessageContent(
         }
 
         is UIMessageContent.AudioAssetMessage -> {
-            val audioMessageState: AudioState = audioMessagesState[message.header.messageId]
-                ?: AudioState.DEFAULT
+            Column {
+                val audioMessageState: AudioState = audioMessagesState[message.header.messageId]
+                    ?: AudioState.DEFAULT
 
-            val totalTimeInMs = remember(audioMessageState.totalTimeInMs) {
-                audioMessageState.sanitizeTotalTime(messageContent.audioMessageDurationInMs.toInt())
-            }
+                val totalTimeInMs = remember(audioMessageState.totalTimeInMs) {
+                    audioMessageState.sanitizeTotalTime(messageContent.audioMessageDurationInMs.toInt())
+                }
 
-            AudioMessage(
-                audioMediaPlayingState = audioMessageState.audioMediaPlayingState,
-                totalTimeInMs = totalTimeInMs,
-                currentPositionInMs = audioMessageState.currentPositionInMs,
-                onPlayButtonClick = { onAudioClick(message.header.messageId) },
-                onSliderPositionChange = { position ->
-                    onChangeAudioPosition(message.header.messageId, position.toInt())
-                },
-                onAudioMessageLongClick = onLongClick
-            )
+                AudioMessage(
+                    audioMediaPlayingState = audioMessageState.audioMediaPlayingState,
+                    totalTimeInMs = totalTimeInMs,
+                    currentPositionInMs = audioMessageState.currentPositionInMs,
+                    onPlayButtonClick = { onAudioClick(message.header.messageId) },
+                    onSliderPositionChange = { position ->
+                        onChangeAudioPosition(message.header.messageId, position.toInt())
+                    },
+                    onAudioMessageLongClick = onLongClick
+                )
+                PartialDeliveryInformation(messageContent.deliveryStatus)
+            }
         }
 
         UIMessageContent.Deleted -> {}