From edb2c963c6a99dc0aaf8a1923373835a067a3241 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Thu, 27 Feb 2025 22:24:23 +0100
Subject: [PATCH 1/2] avoid using some deprecated strings

---
 .../java/org/thoughtcrime/securesms/MediaPreviewActivity.java   | 2 +-
 .../org/thoughtcrime/securesms/MessageSelectorFragment.java     | 2 +-
 src/main/res/menu/profile_context.xml                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 21bcf764a..624facbfb 100644
--- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -340,7 +340,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
       return;
     }
 
-    String text = getResources().getQuantityString(R.plurals.ask_delete_messages_simple, 1, 1);
+    String text = getResources().getQuantityString(R.plurals.ask_delete_messages, 1, 1);
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(text);
diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java
index a5dc2cc43..763a46174 100644
--- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java
@@ -63,7 +63,7 @@ public abstract class MessageSelectorFragment
   protected void handleDeleteMessages(int chatId, final int[] messageIds) {
     DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId);
 
-    String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages_simple, messageIds.length, messageIds.length);
+    String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages, messageIds.length, messageIds.length);
 
     AlertDialog dialog = new AlertDialog.Builder(getActivity())
             .setMessage(text)
diff --git a/src/main/res/menu/profile_context.xml b/src/main/res/menu/profile_context.xml
index 2ac3d5dcd..017fb785e 100644
--- a/src/main/res/menu/profile_context.xml
+++ b/src/main/res/menu/profile_context.xml
@@ -6,7 +6,7 @@
         app:showAsAction="always"/>
 
     <item android:id="@+id/delete"
-        android:title="@string/menu_delete_messages"
+        android:title="@string/delete"
         android:icon="@drawable/ic_delete_white_24dp"
         app:showAsAction="always"/>
 

From d09ad5748d1ad26962666c660943f00e56a79f7a Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Thu, 27 Feb 2025 22:28:48 +0100
Subject: [PATCH 2/2] deprecate cannot_delete_contacts_in_use

---
 .../securesms/ContactSelectionListFragment.java          | 9 +--------
 src/main/res/values/strings.xml                          | 1 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index c611f37aa..07a0b6642 100644
--- a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -212,16 +212,9 @@ public class ContactSelectionListFragment extends    Fragment
           ContactSelectionListAdapter adapter = getContactSelectionListAdapter();
           final SparseIntArray actionModeSelection = adapter.getActionModeSelection().clone();
           new Thread(() -> {
-            boolean failed = false;
             for (int index = 0; index < actionModeSelection.size(); index++) {
               int contactId = actionModeSelection.valueAt(index);
-              boolean currentFailed = !dcContext.deleteContact(contactId);
-              failed = currentFailed || failed;
-            }
-            if (failed) {
-              Util.runOnMain(()-> {
-                Toast.makeText(getActivity(), R.string.cannot_delete_contacts_in_use, Toast.LENGTH_LONG).show();
-              });
+              dcContext.deleteContact(contactId);
             }
           }).start();
           adapter.resetActionModeSelection();
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 655dd3b41..0f3d1edf6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -387,6 +387,7 @@
     <string name="ask_unblock_contact">Unblock this contact?</string>
     <string name="ask_delete_contacts">Delete contacts?\n\nContacts with ongoing chats or from the system address book cannot be deleted permanently.</string>
     <string name="ask_delete_contact">Delete contact %1$s?\n\nContacts with ongoing chats or from the system address book cannot be deleted permanently.</string>
+    <!-- deprecated -->
     <string name="cannot_delete_contacts_in_use">Cannot delete contacts with ongoing chats.</string>
     <string name="ask_start_chat_with">Chat with %1$s?</string>
     <string name="ask_delete_value">Delete %s?</string>