From d8b85768d2240b95755a26267ced1ed978d1a503 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 7 Jul 2023 10:46:43 +0930
Subject: [PATCH] Fix sms messages

---
 .../securesms/conversation/v2/MessageDetailActivity.kt    | 2 +-
 .../securesms/conversation/v2/MessageDetailsViewModel.kt  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index d8f8a9d7f..f95f25719 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -183,7 +183,7 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
                 modifier = Modifier.verticalScroll(rememberScrollState()),
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
-                messageDetails.mmsRecord?.let { message ->
+                messageDetails.record?.let { message ->
                     AndroidView(
                         modifier = Modifier.padding(horizontal = 32.dp),
                         factory = {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
index b92a39934..01864aeb1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
@@ -20,6 +20,7 @@ data class TitledText(val title: String, val value: String)
 
 data class MessageDetails(
     val attachments: List<Attachment> = emptyList(),
+    val record: MessageRecord? = null,
     val mmsRecord: MmsMessageRecord? = null,
     val sent: TitledText? = null,
     val received: TitledText? = null,
@@ -38,13 +39,14 @@ class MessageDetailsViewModel @Inject constructor(
     private val attachmentDb: AttachmentDatabase
 ): ViewModel() {
 
-    fun setMessageRecord(value: MessageRecord?, error: String?) {
-        val mmsRecord = value as? MmsMessageRecord
+    fun setMessageRecord(record: MessageRecord?, error: String?) {
+        val mmsRecord = record as? MmsMessageRecord
 
         val slides: List<Slide> = mmsRecord?.slideDeck?.thumbnailSlides?.toList() ?: emptyList()
 
-        _details.value = value?.run {
+        _details.value = record?.run {
             MessageDetails(
+                record = record,
                 mmsRecord = mmsRecord,
                 attachments = slides.map { Attachment(it, it.details) },
                 sent = dateSent.let(::Date).toString().let { TitledText("Sent:", it) },