From 27971a2a08db623d708a1adf8dc7625c360d058b Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 9 Mar 2026 19:05:10 +0100 Subject: [PATCH] Disabled ID command by default --- app/src/main/java/eu/faircode/email/Core.java | 2 +- app/src/main/java/eu/faircode/email/EmailService.java | 2 +- .../main/java/eu/faircode/email/FragmentOptionsPrivacy.java | 2 +- app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 4d8829a93c..9e0680fff4 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -4977,7 +4977,7 @@ class Core { if (mdn && helper.isReport()) try { MessageHelper.Report r = parts.getReport(context); - boolean client_id = prefs.getBoolean("client_id", true); + boolean client_id = prefs.getBoolean("client_id", false); String we = "dns;" + (client_id ? EmailService.getDefaultEhlo() : "example.com"); if (r != null && !we.equals(r.reporter)) { String label = null; diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index 3ea99a2ef7..013e287567 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -914,7 +914,7 @@ public class EmailService implements AutoCloseable { if (istore.hasCapability("ID")) try { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean client_id = prefs.getBoolean("client_id", true); + boolean client_id = prefs.getBoolean("client_id", false); Map sid = istore.id(client_id ? getId(context) : null); if (sid != null) { Map crumb = new HashMap<>(); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java index 1bd0afe2c2..37ad858cfa 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -705,7 +705,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer swAutoLock.setChecked(prefs.getBoolean("autolock", true)); swAutoLockNav.setChecked(prefs.getBoolean("autolock_nav", false)); - swClientId.setChecked(prefs.getBoolean("client_id", true)); + swClientId.setChecked(prefs.getBoolean("client_id", false)); swHideTimeZone.setChecked(prefs.getBoolean("hide_timezone", false)); swDisplayHidden.setChecked(prefs.getBoolean("display_hidden", false)); swIncognitoKeyboard.setChecked(prefs.getBoolean("incognito_keyboard", false)); diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index a5d48fc82f..8c283521e6 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -943,7 +943,7 @@ public class MessageHelper { report.addBodyPart(plainPart); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean client_id = prefs.getBoolean("client_id", true); + boolean client_id = prefs.getBoolean("client_id", false); String from = null; if (message.from != null && message.from.length > 0) @@ -988,7 +988,7 @@ public class MessageHelper { report.addBodyPart(plainPart); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean client_id = prefs.getBoolean("client_id", true); + boolean client_id = prefs.getBoolean("client_id", false); String from = null; if (message.from != null && message.from.length > 0)