From c095510a4282ca0192726363a067a3db64369588 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 22 Jul 2025 16:56:25 +0200 Subject: [PATCH] don't show "delete for everyone" in unnecrypted chats --- .../java/org/thoughtcrime/securesms/MediaPreviewActivity.java | 2 +- .../org/thoughtcrime/securesms/MessageSelectorFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index bcb848cae..c8d46085a 100644 --- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -359,7 +359,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity finish(); }); - if(dcChat.canSend() && !dcChat.isSelfTalk() && dcMsg.isOutgoing()) { + if(dcChat.isEncrypted() && dcChat.canSend() && !dcChat.isSelfTalk() && dcMsg.isOutgoing()) { builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> { Util.runOnAnyBackgroundThread(() -> dcContext.sendDeleteRequest(messageIds)); finish(); diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java index e8c1bd57b..178da5bc0 100644 --- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -64,7 +64,7 @@ public abstract class MessageSelectorFragment protected void handleDeleteMessages(int chatId, final int[] messageIds) { DcChat dcChat = dcContext.getChat(chatId); boolean canDeleteForAll = true; - if (dcChat.canSend() && !dcChat.isSelfTalk()) { + if (dcChat.isEncrypted() && dcChat.canSend() && !dcChat.isSelfTalk()) { for(int msgId : messageIds) { DcMsg msg = dcContext.getMsg(msgId); if (!msg.isOutgoing() || msg.isInfo()) {