From 1680d332f5b6a5447803f3de144a5ce47b59d266 Mon Sep 17 00:00:00 2001 From: bjoern Date: Tue, 1 Apr 2025 16:42:48 +0200 Subject: [PATCH] hide 'show classic email' for chatmail (#3708) * hide 'show classic email' for chatmail * update CHANGELOG --- CHANGELOG.md | 4 ++++ .../preferences/AdvancedPreferenceFragment.java | 1 + src/main/res/xml/preferences_advanced.xml | 16 ++++++++-------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 047946de8..1618222af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Delta Chat Android Changelog +## Unreleased + +* hide superfluous "Show Classic E-mails" advanced setting for chatmail + ## v1.56.1 2025-03 diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 12a523425..a41f302ed 100644 --- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -250,6 +250,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment } if (dcContext.isChatmail()) { + showEmails.setVisible(false); showSystemContacts.setVisible(false); sentboxWatchCheckbox.setVisible(false); bccSelfCheckbox.setVisible(false); diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml index f106c7246..e10085788 100644 --- a/src/main/res/xml/preferences_advanced.xml +++ b/src/main/res/xml/preferences_advanced.xml @@ -2,11 +2,8 @@ - + - - + +