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

Fix edit message clearing story reply quote.

Browse Source
This commit is contained in:
Clark
2024-07-19 14:22:21 -04:00
committed by Nicholas Tinsley
parent 0aeaec8b67
commit bc6face873
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View File

@@ -2966,6 +2966,17 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
}
}
val parentStoryId: Long = if (editedMessage == null) {
if (message.parentStoryId != null) message.parentStoryId.serialize() else 0
} else {
val originalId = (editedMessage as? MmsMessageRecord)?.parentStoryId
if (originalId != null && message.outgoingQuote != null) {
originalId.serialize()
} else {
0L
}
}
val contentValues = ContentValues()
contentValues.put(DATE_SENT, message.sentTimeMillis)
contentValues.put(TYPE, type)
@@ -2981,7 +2992,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
contentValues.put(HAS_DELIVERY_RECEIPT, earlyDeliveryReceipts.values.sumOf { it.count })
contentValues.put(RECEIPT_TIMESTAMP, earlyDeliveryReceipts.values.map { it.timestamp }.maxOrNull() ?: -1L)
contentValues.put(STORY_TYPE, message.storyType.code)
contentValues.put(PARENT_STORY_ID, if (message.parentStoryId != null) message.parentStoryId.serialize() else 0)
contentValues.put(PARENT_STORY_ID, parentStoryId)
contentValues.put(SCHEDULED_DATE, message.scheduledDate)
contentValues.putNull(LATEST_REVISION_ID)
contentValues.put(MESSAGE_EXTRAS, message.messageExtras?.encode())

4
app/src/main/java/org/thoughtcrime/securesms/messages/EditMessageProcessor.kt
View File

@@ -122,7 +122,7 @@ object EditMessageProcessor {
): InsertResult? {
val messageRanges: BodyRangeList? = message.bodyRanges.filter { it.mentionAci == null }.toList().toBodyRangeList()
val targetQuote = targetMessage.quote
val quote: QuoteModel? = if (targetQuote != null && message.quote != null) {
val quote: QuoteModel? = if (targetQuote != null && (message.quote != null || (targetMessage.parentStoryId != null && message.storyContext != null))) {
QuoteModel(
targetQuote.id,
targetQuote.author,
@@ -153,6 +153,7 @@ object EditMessageProcessor {
groupId = groupId,
attachments = attachments,
quote = quote,
parentStoryId = targetMessage.parentStoryId,
sharedContacts = emptyList(),
linkPreviews = DataMessageProcessor.getLinkPreviews(message.preview, message.body ?: "", false),
mentions = DataMessageProcessor.getMentions(message.bodyRanges),
@@ -188,6 +189,7 @@ object EditMessageProcessor {
receivedTimeMillis = targetMessage.dateReceived,
body = message.body,
groupId = groupId,
parentStoryId = targetMessage.parentStoryId,
expiresIn = targetMessage.expiresIn,
isUnidentified = metadata.sealedSender,
serverGuid = envelope.serverGuid