From 7e82dee6654a3a95437bf3b6997575e33fa0fc57 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 7 Jun 2022 18:12:49 +0200 Subject: [PATCH] Disconnect's protecting list is unsuitable for tracking images --- app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java | 1 + app/src/main/java/eu/faircode/email/HtmlHelper.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java index 0817ab821d..5cd57c54f6 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -502,6 +502,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer sb.append(value); } tvClientId.setText(sb); + swDisconnectImages.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE); PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this); diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index e4790f411c..0547b46b63 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -2186,7 +2186,7 @@ public class HtmlHelper { static void removeTrackingPixels(Context context, Document document) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean disconnect_images = prefs.getBoolean("disconnect_images", false); + boolean disconnect_images = (prefs.getBoolean("disconnect_images", false) && BuildConfig.DEBUG); Drawable d = context.getDrawable(R.drawable.twotone_my_location_24); d.setTint(Helper.resolveColor(context, R.attr.colorWarning));