From f66f305d76e28f46f2bff9de5c195d94cb56b6a3 Mon Sep 17 00:00:00 2001 From: jubb Date: Mon, 5 Jul 2021 15:48:46 +1000 Subject: [PATCH] fix: quote model uses own address if outgoing in the send to match the bind --- .../securesms/conversation/v2/ConversationActivityV2.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index cf36023b17..96b3675e1e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -885,7 +885,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe message.text = body val quote = quotedMessage?.let { val quotedAttachments = (it as? MmsMessageRecord)?.slideDeck?.asAttachments() ?: listOf() - QuoteModel(it.dateSent, it.individualRecipient.address, it.body, false, quotedAttachments) + val sender = if (it.isOutgoing) fromSerialized(TextSecurePreferences.getLocalNumber(this)!!) else it.individualRecipient.address + QuoteModel(it.dateSent, sender, it.body, false, quotedAttachments) } val outgoingTextMessage = OutgoingMediaMessage.from(message, thread, attachments, quote, linkPreview) // Clear the input bar