From 0289f47adcef6cc29a57cce5047ee28ba5864ee6 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 7 Dec 2025 17:18:39 +0100 Subject: [PATCH 1/5] remove realtime preference toggle --- .../thoughtcrime/securesms/ApplicationContext.java | 3 +++ .../org/thoughtcrime/securesms/connect/DcHelper.java | 1 - .../preferences/AdvancedPreferenceFragment.java | 12 ------------ src/main/res/xml/preferences_advanced.xml | 6 ------ 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index e17fb166c..51f41060a 100644 --- a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -112,6 +112,9 @@ public class ApplicationContext extends MultiDexApplication { } } + // 2025.12.07: revert to enabled since the setting was removed + ac.setConfigInt("webxdc_realtime_enabled", 1); + // 2025.11.12: this is needed until core starts ignoring "delete_server_after" for chatmail if (ac.isChatmail()) { ac.setConfig("delete_server_after", null); // reset diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index e1cf6c408..b32c27ec0 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -60,7 +60,6 @@ public class DcHelper { public static final String CONFIG_MEDIA_QUALITY = "media_quality"; public static final String CONFIG_PROXY_ENABLED = "proxy_enabled"; public static final String CONFIG_PROXY_URL = "proxy_url"; - public static final String CONFIG_WEBXDC_REALTIME_ENABLED = "webxdc_realtime_enabled"; public static final String CONFIG_PRIVATE_TAG = "private_tag"; public static DcContext getContext(@NonNull Context context) { diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 5387114b0..ee4410428 100644 --- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -6,7 +6,6 @@ import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_BCC_SELF; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_MVBOX_MOVE; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ONLY_FETCH_MVBOX; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SHOW_EMAILS; -import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_WEBXDC_REALTIME_ENABLED; import android.content.Context; import android.content.Intent; @@ -53,7 +52,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment CheckBoxPreference multiDeviceCheckbox; CheckBoxPreference mvboxMoveCheckbox; CheckBoxPreference onlyFetchMvboxCheckbox; - CheckBoxPreference webxdcRealtimeCheckbox; @Override public void onCreate(Bundle paramBundle) { @@ -119,15 +117,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment })); } - webxdcRealtimeCheckbox = (CheckBoxPreference) this.findPreference("pref_webxdc_realtime_enabled"); - if (webxdcRealtimeCheckbox != null) { - webxdcRealtimeCheckbox.setOnPreferenceChangeListener((preference, newValue) -> { - boolean enabled = (Boolean) newValue; - dcContext.setConfigInt(CONFIG_WEBXDC_REALTIME_ENABLED, enabled? 1 : 0); - return true; - }); - } - Preference screenSecurity = this.findPreference(Prefs.SCREEN_SECURITY_PREF); if (screenSecurity != null) { screenSecurity.setOnPreferenceChangeListener(new ScreenShotSecurityListener()); @@ -233,7 +222,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment multiDeviceCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_BCC_SELF)); mvboxMoveCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_MVBOX_MOVE)); onlyFetchMvboxCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_ONLY_FETCH_MVBOX)); - webxdcRealtimeCheckbox.setChecked(0!=dcContext.getConfigInt(CONFIG_WEBXDC_REALTIME_ENABLED)); } @Override diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml index dc540cb4f..c5e3b8af8 100644 --- a/src/main/res/xml/preferences_advanced.xml +++ b/src/main/res/xml/preferences_advanced.xml @@ -62,12 +62,6 @@ android:summary="@string/pref_incognito_keyboard_explain" android:title="@string/pref_incognito_keyboard" /> - - From 87c49dc680e4a26021c3c606c3e1ace014df0003 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 7 Dec 2025 17:29:07 +0100 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68591e5a7..5e8f97ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ * remove deprecated "companion app" code * remove deprecated "Watch Sent Folder" preference * remove deprecated "send self-report" preference +* remove deprecated "real-time apps" switch * don't show email address in shared vcard * update to core 2.25.0 From 1b9c6197398de5a86115c97f35654f39174a16ca Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 15 Dec 2025 12:53:16 +0100 Subject: [PATCH 3/5] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ff18e22..bc5b2a136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased * Allow to add relay from clipboard or image if camera permission is not granted +* Remove deprecated "real-time apps" switch ## v2.33.1 2025-12 @@ -50,7 +51,6 @@ * remove deprecated "companion app" code * remove deprecated "Watch Sent Folder" preference * remove deprecated "send self-report" preference -* remove deprecated "real-time apps" switch * don't show email address in shared vcard * update to core 2.25.0 From 0a7839fb7d8ada3acd72fe31c6f30204a637764e Mon Sep 17 00:00:00 2001 From: adb Date: Wed, 17 Dec 2025 12:06:50 +0100 Subject: [PATCH 4/5] Update src/main/java/org/thoughtcrime/securesms/ApplicationContext.java Co-authored-by: Hocuri --- .../java/org/thoughtcrime/securesms/ApplicationContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 5b1edb84b..772a1df17 100644 --- a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -171,7 +171,7 @@ public class ApplicationContext extends MultiDexApplication { // 2025.12.07: revert to enabled since the setting was removed ac.setConfigInt("webxdc_realtime_enabled", 1); - // 2025.11.12: this is needed until core starts ignoring "delete_server_after" for chatmail + // 2025-11-12: this is needed until core starts ignoring "delete_server_after" for chatmail if (ac.isChatmail()) { ac.setConfig("delete_server_after", null); // reset } From 8ceb12370ffdbcd9e87bae62ec4d73fdfd711543 Mon Sep 17 00:00:00 2001 From: adb Date: Wed, 17 Dec 2025 12:07:01 +0100 Subject: [PATCH 5/5] Update src/main/java/org/thoughtcrime/securesms/ApplicationContext.java Co-authored-by: Hocuri --- .../java/org/thoughtcrime/securesms/ApplicationContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 772a1df17..2fd3a5aee 100644 --- a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -168,7 +168,8 @@ public class ApplicationContext extends MultiDexApplication { } } - // 2025.12.07: revert to enabled since the setting was removed + // 2025-12-16: The setting was removed. + // Revert it to the default if it was changed in the past. ac.setConfigInt("webxdc_realtime_enabled", 1); // 2025-11-12: this is needed until core starts ignoring "delete_server_after" for chatmail