From 5ab215489ad1e9dcbd57c8145d027b59aa59d9f4 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sat, 15 Nov 2025 23:24:57 +0100
Subject: [PATCH] tweak to suggestions

---
 .../AdvancedPreferenceFragment.java           | 23 +++++++++++--------
 src/main/res/values/strings.xml               |  3 ++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 54850ed6d..0d78bdd58 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -80,15 +80,20 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
     if (multiDeviceCheckbox != null) {
       multiDeviceCheckbox.setOnPreferenceChangeListener((preference, newValue) -> {
         boolean enabled = (Boolean) newValue;
-        new AlertDialog.Builder(requireContext())
-                .setMessage(R.string.pref_imap_folder_warn_disable_defaults)
-                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-                  dcContext.setConfigInt(CONFIG_BCC_SELF, enabled? 1 : 0);
-                  ((CheckBoxPreference)preference).setChecked(enabled);
-                })
-                .setNegativeButton(R.string.cancel, null)
-                .show();
-        return false;
+        if (enabled) {
+            dcContext.setConfigInt(CONFIG_BCC_SELF, 1);
+            return true;
+        } else {
+          new AlertDialog.Builder(requireContext())
+                  .setMessage(R.string.pref_multidevice_change_warn)
+                  .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                    dcContext.setConfigInt(CONFIG_BCC_SELF, 0);
+                    ((CheckBoxPreference)preference).setChecked(false);
+                  })
+                  .setNegativeButton(R.string.cancel, null)
+                  .show();
+          return false;
+        }
       });
     }
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index da21c1ddb..2a9fa881e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -814,7 +814,8 @@
     <!-- deprecated -->
     <string name="pref_watch_sent_folder">Watch Sent Folder</string>
     <string name="pref_send_copy_to_self">Multi-device Mode</string>
-    <string name="pref_send_copy_to_self_explain">Required when using this profile on multiple devices.</string>
+    <string name="pref_send_copy_to_self_explain">Send background messages for device synchronization. Automatically enabled on adding a second device</string>
+    <string name="pref_multidevice_change_warn">Multi-device Mode must be enabled when using the same profile on multiple devices. Only disable this setting if you have removed this profile from all your other devices.\n\nDisabling multi-device mode while using the profile on multiple devices will result in missed messages and other problems.</string>
     <string name="pref_auto_folder_moves">Move automatically to DeltaChat Folder</string>
     <string name="pref_auto_folder_moves_explain">Chat conversations are moved to avoid cluttering the Inbox</string>
     <string name="pref_only_fetch_mvbox_title">Only Fetch from DeltaChat Folder</string>