From f004ad5acdada27b7126eeebfc38ca1bdd2b3f0b Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 17 Oct 2024 13:02:43 +1100 Subject: [PATCH] Avoiding adding reactions if the message is marked as deleted --- .../java/org/thoughtcrime/securesms/database/Storage.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index a1903cc891..d8460159fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -1686,12 +1686,21 @@ open class Storage( val timestamp = reaction.timestamp val localId = reaction.localId val isMms = reaction.isMms + val messageId = if (localId != null && localId > 0 && isMms != null) { + // bail early is the message is marked as deleted + val messagingDatabase: MessagingDatabase = if (isMms == true) DatabaseComponent.get(context).mmsDatabase() + else DatabaseComponent.get(context).smsDatabase() + if(messagingDatabase.getMessageRecord(localId)?.isDeleted == true) return + MessageId(localId, isMms) } else if (timestamp != null && timestamp > 0) { val messageRecord = DatabaseComponent.get(context).mmsSmsDatabase().getMessageForTimestamp(timestamp) ?: return + if (messageRecord.isDeleted) return + MessageId(messageRecord.id, messageRecord.isMms) } else return + DatabaseComponent.get(context).reactionDatabase().addReaction( messageId, ReactionRecord(