From 383f7556e37678a4638697e27920f88393a7ffdb Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Mon, 8 Jul 2024 16:49:12 -0400 Subject: [PATCH] Fix delete for everyone dialog option in note to self. --- .../main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt index b7866ef932..4135bf5d3a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt @@ -60,10 +60,9 @@ object DeleteDialog { }.executeOnExecutor(SignalExecutors.BOUNDED) } - val canDeleteForEveryone = MessageConstraintsUtil.isValidRemoteDeleteSend(messageRecords, System.currentTimeMillis()) && !isNoteToSelfDelete val canDeleteForEveryoneInNoteToSelf = isNoteToSelfDelete && TextSecurePreferences.isMultiDevice(context) && !deleteSyncEnabled - if (canDeleteForEveryone || canDeleteForEveryoneInNoteToSelf) { + if (MessageConstraintsUtil.isValidRemoteDeleteSend(messageRecords, System.currentTimeMillis()) && (!isNoteToSelfDelete || canDeleteForEveryoneInNoteToSelf)) { builder.setNeutralButton(if (isNoteToSelfDelete) R.string.ConversationFragment_delete_everywhere else R.string.ConversationFragment_delete_for_everyone) { _, _ -> handleDeleteForEveryone(context, messageRecords, emitter) } } }