Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use quote contents in edit sync messages.

Browse Source 
Resolves #13571
This commit is contained in:
Greyson Parrelli
2024-06-25 10:53:44 -04:00
committed by Cody Henthorne
parent 72d02104dc
commit 9dc67e0466
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
View File

@@ -322,7 +322,7 @@ object SyncMessageProcessor {
}
if (message.isMediaMessage) {
handleSynchronizeSentEditMediaMessage(context, targetMessage, toRecipient, sent, message, envelope.timestamp!!)
handleSynchronizeSentEditMediaMessage(targetMessage, toRecipient, sent, message, envelope.timestamp!!)
} else {
handleSynchronizeSentEditTextMessage(targetMessage, toRecipient, sent, message, envelope.timestamp!!)
}
@@ -388,7 +388,6 @@ object SyncMessageProcessor {
}
private fun handleSynchronizeSentEditMediaMessage(
context: Context,
targetMessage: MessageRecord,
toRecipient: Recipient,
sent: Sent,
@@ -397,7 +396,22 @@ object SyncMessageProcessor {
) {
log(envelopeTimestamp, "Synchronize sent edit media message for: ${targetMessage.id}")
val quote: QuoteModel? = DataMessageProcessor.getValidatedQuote(context, envelopeTimestamp, message)
val targetQuote = (targetMessage as? MmsMessageRecord)?.quote
val quote: QuoteModel? = if (targetQuote != null && message.quote != null) {
QuoteModel(
targetQuote.id,
targetQuote.author,
targetQuote.displayText.toString(),
targetQuote.isOriginalMissing,
emptyList(),
null,
targetQuote.quoteType,
null
)
} else {
null
}
val sharedContacts: List<Contact> = DataMessageProcessor.getContacts(message)
val previews: List<LinkPreview> = DataMessageProcessor.getLinkPreviews(message.preview, message.body ?: "", false)
val mentions: List<Mention> = DataMessageProcessor.getMentions(message.bodyRanges)