Don't show body in replies to voice messages but rather show "Voice m…

…essage" string (#1673) Story: element-hq/element-meta#2106
element-hq · Oct 27, 2023 · 563aaa6 · 563aaa6
1 parent a51fdf9
commit 563aaa6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...sages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/...sages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -332,7 +332,7 @@ class MessagesPresenter @AssistedInject constructor(
                 type = AttachmentThumbnailType.Audio,
             )
             is TimelineItemVoiceContent -> AttachmentThumbnailInfo(
-                textContent = targetEvent.content.body,
+                textContent = textContent,
                 type = AttachmentThumbnailType.Voice,
             )
             is TimelineItemLocationContent -> AttachmentThumbnailInfo(

diff --git a/...pl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/...pl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -318,7 +318,7 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif
                     )
                 )
             }
-            content = { ContentForBody(event.content.body) }
+            content = { ContentForBody(textContent) }
         }
     }
     Row(modifier = modifier) {

diff --git a/...lin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/...lin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -618,7 +618,6 @@ private fun attachmentThumbnailInfoForInReplyTo(inReplyTo: InReplyTo.Ready): Att
             type = AttachmentThumbnailType.Audio,
         )
         is VoiceMessageType -> AttachmentThumbnailInfo(
-            textContent = messageContent.body,
             type = AttachmentThumbnailType.Voice,
         )
         else -> null
@@ -630,6 +629,7 @@ private fun textForInReplyTo(inReplyTo: InReplyTo.Ready): String {
     val messageContent = inReplyTo.content as? MessageContent ?: return ""
     return when (messageContent.type) {
         is LocationMessageType -> stringResource(CommonStrings.common_shared_location)
+        is VoiceMessageType -> stringResource(CommonStrings.common_voice_message)
         else -> messageContent.body
     }
 }

diff --git a/...t[f.messages.impl.actionlist_null_SheetContent-D-1_1_null_7,NEXUS_5,1.0,en].png b/...t[f.messages.impl.actionlist_null_SheetContent-D-1_1_null_7,NEXUS_5,1.0,en].png
diff --git a/...t[f.messages.impl.actionlist_null_SheetContent-N-1_2_null_7,NEXUS_5,1.0,en].png b/...t[f.messages.impl.actionlist_null_SheetContent-N-1_2_null_7,NEXUS_5,1.0,en].png
-Original file line number
+Diff line change
@@ Expand Up @@
                         )
                     )
                 }
-                content = { ContentForBody(event.content.body) }
+                content = { ContentForBody(textContent) }
             }
         }
         Row(modifier = modifier) {
@@ Expand Down @@