diff --git a/CHANGELOG.md b/CHANGELOG.md index 09bba51dd..71b9004c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * allow to edit messages * allow to delete messages for everyone * add menu option to easily save/unsave selected message +* improve deletion confirmation for "Device Messages" ## v1.54.4 2025-03 diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index f788292f1..b603d2eff 100644 --- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -344,7 +344,9 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity DcMsg dcMsg = dcContext.getMsg(mediaItem.msgId); DcChat dcChat = dcContext.getChat(dcMsg.getChatId()); - String text = getResources().getQuantityString(R.plurals.ask_delete_messages, 1, 1); + String text = getResources().getQuantityString( + dcChat.isDeviceTalk() ? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages, + 1, 1); int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me; final int[] messageIds = new int[]{mediaItem.msgId}; diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java index b56c5fad0..82ca25928 100644 --- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -75,7 +75,9 @@ public abstract class MessageSelectorFragment canDeleteForAll = false; } - String text = requireActivity().getResources().getQuantityString(R.plurals.ask_delete_messages, messageIds.length, messageIds.length); + String text = getActivity().getResources().getQuantityString( + dcChat.isDeviceTalk() ? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages, + messageIds.length, messageIds.length); int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me; AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity()) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 50dc05bc6..85c4a5ac0 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -377,7 +377,7 @@ Delete %d message on all your devices? Delete %d messages on all your devices? - + Delete %d message? Delete %d messages?