From a640c81c734052dc60d6e6e77cfb9b99deac0ba4 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 27 Feb 2025 22:16:31 +0100 Subject: [PATCH 01/13] add bindings for new "delete for everyone" API --- jni/dc_wrapper.c | 9 +++++++++ src/main/java/com/b44t/messenger/DcContext.java | 1 + 2 files changed, 10 insertions(+) diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 6d175246f..bbf24a41f 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -685,6 +685,15 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_deleteMsgs(JNIEnv *env, jobject } +JNIEXPORT void Java_com_b44t_messenger_DcContext_sendDeleteRequest(JNIEnv *env, jobject obj, jintArray msg_ids) +{ + int msg_ids_cnt = 0; + uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt); + dc_send_delete_request(get_dc_context(env, obj), msg_ids_ptr, msg_ids_cnt); + free(msg_ids_ptr); +} + + JNIEXPORT void Java_com_b44t_messenger_DcContext_forwardMsgs(JNIEnv *env, jobject obj, jintArray msg_ids, jint chat_id) { int msg_ids_cnt = 0; diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java index 2fb0ecaae..0c51ca60b 100644 --- a/src/main/java/com/b44t/messenger/DcContext.java +++ b/src/main/java/com/b44t/messenger/DcContext.java @@ -193,6 +193,7 @@ public class DcContext { public native int getFreshMsgCount (int chat_id); public native int estimateDeletionCount(boolean from_server, long seconds); public native void deleteMsgs (int msg_ids[]); + public native void sendDeleteRequest (int msg_ids[]); public native void forwardMsgs (int msg_ids[], int chat_id); public native void saveMsgs (int msg_ids[]); public native boolean resendMsgs (int msg_ids[]); From 624f797888dcea6fc990ca9538546ffbf667ceb4 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 27 Feb 2025 22:17:11 +0100 Subject: [PATCH 02/13] allow to "delete for everyone" outgoing messages --- .../securesms/MessageSelectorFragment.java | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java index 763a46174..be3480d2c 100644 --- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -61,20 +61,44 @@ public abstract class MessageSelectorFragment } protected void handleDeleteMessages(int chatId, final int[] messageIds) { - DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId); + DcChat dcChat = dcContext.getChat(chatId); + boolean canDeleteForAll = true; + if (dcChat.canSend() && !dcChat.isSelfTalk()) { + for(int msgId : messageIds) { + DcMsg msg = dcContext.getMsg(msgId); + if (!msg.isOutgoing()) { + canDeleteForAll = false; + break; + } + } + } else { + canDeleteForAll = false; + } - String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages, messageIds.length, messageIds.length); + String text = requireActivity().getResources().getQuantityString(R.plurals.ask_delete_messages, messageIds.length, messageIds.length); + int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me; - AlertDialog dialog = new AlertDialog.Builder(getActivity()) - .setMessage(text) - .setCancelable(true) - .setPositiveButton(R.string.delete, (d, which) -> { - dcContext.deleteMsgs(messageIds); - if (actionMode != null) actionMode.finish(); - }) - .setNegativeButton(android.R.string.cancel, null) - .show(); - Util.redPositiveButton(dialog); + AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity()) + .setMessage(text) + .setCancelable(true) + .setNeutralButton(android.R.string.cancel, null) + .setPositiveButton(positiveBtnLabel, (d, which) -> { + dcContext.deleteMsgs(messageIds); + if (actionMode != null) actionMode.finish(); + }); + + if(canDeleteForAll) { + builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> { + dcContext.sendDeleteRequest(messageIds); + if (actionMode != null) actionMode.finish(); + }); + AlertDialog dialog = builder.show(); + Util.redButton(dialog, AlertDialog.BUTTON_NEGATIVE); + Util.redPositiveButton(dialog); + } else { + AlertDialog dialog = builder.show(); + Util.redPositiveButton(dialog); + } } protected void handleSaveAttachment(final Set messageRecords) { From 841e5ee30a0848f43f08d9fdb77cef7742258875 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 27 Feb 2025 22:55:44 +0100 Subject: [PATCH 03/13] show "delete for everyone" in MediaPreviewActivity --- .../securesms/MediaPreviewActivity.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 624facbfb..f788292f1 100644 --- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -43,6 +43,7 @@ import androidx.loader.content.Loader; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; +import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcMediaGalleryElement; import com.b44t.messenger.DcMsg; @@ -340,26 +341,34 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity return; } + DcMsg dcMsg = dcContext.getMsg(mediaItem.msgId); + DcChat dcChat = dcContext.getChat(dcMsg.getChatId()); + String text = getResources().getQuantityString(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}; AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(text); builder.setCancelable(true); - - builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> { - new AsyncTask() { - @Override - protected Void doInBackground(Void... voids) { - dcContext.deleteMsgs(new int[]{mediaItem.msgId}); - return null; - } - }.execute(); - + builder.setNeutralButton(android.R.string.cancel, null); + builder.setPositiveButton(positiveBtnLabel, (dialogInterface, which) -> { + Util.runOnAnyBackgroundThread(() -> dcContext.deleteMsgs(messageIds)); finish(); }); - builder.setNegativeButton(android.R.string.cancel, null); - AlertDialog dialog = builder.show(); - Util.redPositiveButton(dialog); + + if(dcChat.canSend() && !dcChat.isSelfTalk() && dcMsg.isOutgoing()) { + builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> { + Util.runOnAnyBackgroundThread(() -> dcContext.sendDeleteRequest(messageIds)); + finish(); + }); + AlertDialog dialog = builder.show(); + Util.redButton(dialog, AlertDialog.BUTTON_NEGATIVE); + Util.redPositiveButton(dialog); + } else { + AlertDialog dialog = builder.show(); + Util.redPositiveButton(dialog); + } } @Override From a2847ea45e08b3959e0d782311917248ac228b8c Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 27 Feb 2025 23:10:16 +0100 Subject: [PATCH 04/13] allow to edit messages --- .../java/org/thoughtcrime/securesms/ConversationFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index d64f65f82..0cc5182fa 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -365,8 +365,7 @@ public class ConversationFragment extends MessageSelectorFragment } static boolean canEditMsg(DcMsg dcMsg) { - return false; // don't allow to edit for now - // return dcMsg.isOutgoing() && !dcMsg.isInfo() && dcMsg.getType() != DcMsg.DC_MSG_VIDEOCHAT_INVITATION && !dcMsg.hasHtml() && !dcMsg.getText().isEmpty(); + return dcMsg.isOutgoing() && !dcMsg.isInfo() && dcMsg.getType() != DcMsg.DC_MSG_VIDEOCHAT_INVITATION && !dcMsg.hasHtml() && !dcMsg.getText().isEmpty(); } public void handleClearChat() { From 1663502d357e310a428195ce6e3b8a716146c6b0 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 12 Mar 2025 16:16:34 +0100 Subject: [PATCH 05/13] avoid NPE in processComposeControls --- .../java/org/thoughtcrime/securesms/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 954c7610b..f0db43f5b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -1111,7 +1111,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity doSend = VideoRecoder.prepareVideo(ConversationActivity.this, dcChat.getId(), msg); Util.runOnMain(() -> { try { - progressDialog.dismiss(); + if (progressDialog != null) progressDialog.dismiss(); } catch (final IllegalArgumentException e) { // The activity is finishing/destroyed, do nothing. } From 1340166a91aef125c951fc9648e84571faf1b2e3 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 12 Mar 2025 16:22:45 +0100 Subject: [PATCH 06/13] don't allow to delete info-messages for all --- .../org/thoughtcrime/securesms/MessageSelectorFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java index be3480d2c..b56c5fad0 100644 --- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -66,7 +66,7 @@ public abstract class MessageSelectorFragment if (dcChat.canSend() && !dcChat.isSelfTalk()) { for(int msgId : messageIds) { DcMsg msg = dcContext.getMsg(msgId); - if (!msg.isOutgoing()) { + if (!msg.isOutgoing() || msg.isInfo()) { canDeleteForAll = false; break; } From b4b12862fd25dad49e31d4db6ff3dff3073dae32 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 12 Mar 2025 17:06:18 +0100 Subject: [PATCH 07/13] add action menu icon option to toggle message bookmark --- .../securesms/ConversationFragment.java | 20 +++++++++++++++++-- .../ConversationAdaptiveActionsToolbar.java | 4 +++- .../drawable/baseline_bookmark_border_24.xml | 5 +++++ src/main/res/menu/conversation_context.xml | 5 +++++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 src/main/res/drawable/baseline_bookmark_border_24.xml diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index d64f65f82..9d41b4ea0 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -327,6 +327,7 @@ public class ConversationFragment extends MessageSelectorFragment menu.findItem(R.id.menu_context_edit).setVisible(false); menu.findItem(R.id.menu_context_reply_privately).setVisible(false); menu.findItem(R.id.menu_add_to_home_screen).setVisible(false); + menu.findItem(R.id.menu_toggle_save).setVisible(false); } else { DcMsg messageRecord = messageRecords.iterator().next(); DcChat chat = getListAdapter().getChat(); @@ -339,6 +340,9 @@ public class ConversationFragment extends MessageSelectorFragment boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply; menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately); menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC); + + menu.findItem(R.id.menu_toggle_save).setVisible(messageRecord.canSave() && !chat.isSelfTalk()); + menu.findItem(R.id.menu_toggle_save).setIcon(messageRecord.getSavedMsgId() == 0 ? R.drawable.baseline_bookmark_24 : R.drawable.baseline_bookmark_border_24); } // if one of the selected items cannot be saved, disable saving. @@ -496,6 +500,15 @@ public class ConversationFragment extends MessageSelectorFragment } } + private void handleToggleSave(final Set messageRecords) { + DcMsg msg = getSelectedMessageRecord(messageRecords); + if (msg.getSavedMsgId() != 0) { + dcContext.deleteMsgs(new int[]{msg.getSavedMsgId()}); + } else { + dcContext.saveMsgs(new int[]{msg.getId()}); + } + } + private void reloadList() { reloadList(false); } @@ -988,9 +1001,12 @@ public class ConversationFragment extends MessageSelectorFragment } else if (itemId == R.id.menu_resend) { handleResendMessage(getListAdapter().getSelectedItems()); return true; + } else if (itemId == R.id.menu_toggle_save) { + handleToggleSave(getListAdapter().getSelectedItems()); + actionMode.finish(); + return true; } - - return false; + return false; } } diff --git a/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java index 350932b67..d6b40a492 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java +++ b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java @@ -27,6 +27,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar { private static final int ID_ACTION_2 = R.id.menu_context_copy; private static final int ID_ACTION_3 = R.id.menu_context_share; private static final int ID_ACTION_4 = R.id.menu_context_forward; + private static final int ID_ACTION_5 = R.id.menu_toggle_save; private final int maxShown; @@ -79,7 +80,8 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar { boolean showAsAction = item.getItemId() == ID_ACTION_1 || item.getItemId() == ID_ACTION_2 || item.getItemId() == ID_ACTION_3 - || item.getItemId() == ID_ACTION_4; + || item.getItemId() == ID_ACTION_4 + || item.getItemId() == ID_ACTION_5; if (showAsAction && item.isVisible() && nItemsToShow > 0) { item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); diff --git a/src/main/res/drawable/baseline_bookmark_border_24.xml b/src/main/res/drawable/baseline_bookmark_border_24.xml new file mode 100644 index 000000000..d64b0ea27 --- /dev/null +++ b/src/main/res/drawable/baseline_bookmark_border_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/res/menu/conversation_context.xml b/src/main/res/menu/conversation_context.xml index ff88646c6..81cf21d3f 100644 --- a/src/main/res/menu/conversation_context.xml +++ b/src/main/res/menu/conversation_context.xml @@ -5,6 +5,11 @@ android:icon="@drawable/ic_create_white_24dp" app:showAsAction="ifRoom" /> + + Date: Wed, 12 Mar 2025 17:12:47 +0100 Subject: [PATCH 08/13] set title --- .../org/thoughtcrime/securesms/ConversationFragment.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 9d41b4ea0..06f5c93a5 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -341,8 +341,11 @@ public class ConversationFragment extends MessageSelectorFragment menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately); menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC); - menu.findItem(R.id.menu_toggle_save).setVisible(messageRecord.canSave() && !chat.isSelfTalk()); - menu.findItem(R.id.menu_toggle_save).setIcon(messageRecord.getSavedMsgId() == 0 ? R.drawable.baseline_bookmark_24 : R.drawable.baseline_bookmark_border_24); + boolean saved = messageRecord.getSavedMsgId() != 0; + MenuItem toggleSave = menu.findItem(R.id.menu_toggle_save); + toggleSave.setVisible(messageRecord.canSave() && !chat.isSelfTalk()); + toggleSave.setIcon(saved? R.drawable.baseline_bookmark_border_24 : R.drawable.baseline_bookmark_24); + toggleSave.setTitle(saved? R.string.unsave : R.string.save); } // if one of the selected items cannot be saved, disable saving. From 7bc595a88941be99a148fa851b644a4c85b88268 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 12 Mar 2025 17:12:16 +0100 Subject: [PATCH 09/13] check for CHANGELOG in PRs changing .java files --- .github/mergeable.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/mergeable.yml diff --git a/.github/mergeable.yml b/.github/mergeable.yml new file mode 100644 index 000000000..a63d9f6d5 --- /dev/null +++ b/.github/mergeable.yml @@ -0,0 +1,22 @@ +version: 2 +mergeable: + - when: pull_request.* + name: "Changelog check" + validate: + - do: or + validate: + - do: description + must_include: + regex: '#skip-changelog' + - do: and + validate: + - do: dependent + changed: + file: '**/*.java' + required: ['CHANGELOG.md'] + fail: + - do: checks + status: 'action_required' + payload: + title: CHANGELOG.md might need an update + summary: "Please update CHANGELOG.md or add #skip-changelog to the description" From 6ab94814cad1c3222c8bab0294515213cf3c406d Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 12 Mar 2025 17:32:25 +0100 Subject: [PATCH 10/13] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0165b2b..c042cfaf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Delta Chat Android Changelog +## Unreleased + +* add menu option to easily save/unsave selected message + ## v1.54.4 2025-03 From de76377f3b2e04fda88b084e08a5dc38be2f88ca Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 12 Mar 2025 19:30:45 +0100 Subject: [PATCH 11/13] change bookmark icons --- .../thoughtcrime/securesms/ConversationFragment.java | 2 +- src/main/res/drawable/baseline_bookmark_remove_24.xml | 3 +++ src/main/res/menu/conversation_context.xml | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 src/main/res/drawable/baseline_bookmark_remove_24.xml diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 06f5c93a5..b5b56aa82 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -344,7 +344,7 @@ public class ConversationFragment extends MessageSelectorFragment boolean saved = messageRecord.getSavedMsgId() != 0; MenuItem toggleSave = menu.findItem(R.id.menu_toggle_save); toggleSave.setVisible(messageRecord.canSave() && !chat.isSelfTalk()); - toggleSave.setIcon(saved? R.drawable.baseline_bookmark_border_24 : R.drawable.baseline_bookmark_24); + toggleSave.setIcon(saved? R.drawable.baseline_bookmark_remove_24 : R.drawable.baseline_bookmark_border_24); toggleSave.setTitle(saved? R.string.unsave : R.string.save); } diff --git a/src/main/res/drawable/baseline_bookmark_remove_24.xml b/src/main/res/drawable/baseline_bookmark_remove_24.xml new file mode 100644 index 000000000..1fb5c5a92 --- /dev/null +++ b/src/main/res/drawable/baseline_bookmark_remove_24.xml @@ -0,0 +1,3 @@ + + + diff --git a/src/main/res/menu/conversation_context.xml b/src/main/res/menu/conversation_context.xml index 81cf21d3f..56625123d 100644 --- a/src/main/res/menu/conversation_context.xml +++ b/src/main/res/menu/conversation_context.xml @@ -1,15 +1,15 @@ + + - - Date: Wed, 12 Mar 2025 20:06:27 +0100 Subject: [PATCH 12/13] add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c042cfaf0..09bba51dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* allow to edit messages +* allow to delete messages for everyone * add menu option to easily save/unsave selected message ## v1.54.4 From 10c538ac8ee0cfb8df10ef90556934a584a1cd92 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 12 Mar 2025 20:07:53 +0100 Subject: [PATCH 13/13] no 'delete on all devices' for device messages do not say "Delete on all your devices" when deleting a message in the "Device Messages" chat. while this is a minor, it is one of the first things the user may see, better be correct there to not give a false first impression of correctness :) --- CHANGELOG.md | 1 + .../java/org/thoughtcrime/securesms/MediaPreviewActivity.java | 4 +++- .../org/thoughtcrime/securesms/MessageSelectorFragment.java | 4 +++- src/main/res/values/strings.xml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) 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?