From 9c0ee286fbe0e83367450f6e3a6f83bc98f23aba Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 11 Nov 2022 13:06:12 +0100
Subject: [PATCH] Added option to remove tracking parameters by default

---
 .../email/FragmentDialogOpenLink.java         |  3 ++
 .../email/FragmentOptionsPrivacy.java         | 14 ++++++++-
 .../res/layout/fragment_options_privacy.xml   | 30 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 20eb46fba1..934b546cf6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -114,6 +114,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
 
         final Context context = getContext();
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean sanitize_links = prefs.getBoolean("sanitize_links", false);
         boolean check_links_dbl = prefs.getBoolean("check_links_dbl", BuildConfig.PLAY_STORE_RELEASE);
         boolean disconnect_links = prefs.getBoolean("disconnect_links", true);
 
@@ -575,6 +576,8 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
         tvDisconnectCategories.setVisibility(
                 categories == null || !BuildConfig.DEBUG ? View.GONE : View.VISIBLE);
 
+        cbSanitize.setChecked(sanitize_links);
+
         cbNotAgain.setText(context.getString(R.string.title_no_ask_for_again, uri.getHost()));
         cbNotAgain.setVisibility(
                 UriHelper.isSecure(uri) && !TextUtils.isEmpty(uri.getHost())
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
index b3d10838ea..5c85252cd5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
@@ -66,6 +66,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
     private View view;
     private ImageButton ibHelp;
     private SwitchCompat swConfirmLinks;
+    private SwitchCompat swSanitizeLinks;
     private SwitchCompat swCheckLinksDbl;
     private SwitchCompat swConfirmImages;
     private SwitchCompat swAskImages;
@@ -107,7 +108,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
     private final static int BIP39_WORDS = 6;
 
     private final static String[] RESET_OPTIONS = new String[]{
-            "confirm_links", "check_links_dbl",
+            "confirm_links", "sanitize_links", "check_links_dbl",
             "confirm_images", "ask_images", "html_always_images", "confirm_html", "ask_html",
             "disable_tracking",
             "pin", "biometrics", "biometrics_timeout", "autolock", "autolock_nav",
@@ -130,6 +131,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
 
         ibHelp = view.findViewById(R.id.ibHelp);
         swConfirmLinks = view.findViewById(R.id.swConfirmLinks);
+        swSanitizeLinks = view.findViewById(R.id.swSanitizeLinks);
         swCheckLinksDbl = view.findViewById(R.id.swCheckLinksDbl);
         swConfirmImages = view.findViewById(R.id.swConfirmImages);
         swAskImages = view.findViewById(R.id.swAskImages);
@@ -191,10 +193,18 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
                         if (key.endsWith(".confirm_link"))
                             editor.remove(key);
                 editor.apply();
+                swSanitizeLinks.setEnabled(checked);
                 swCheckLinksDbl.setEnabled(checked);
             }
         });
 
+        swSanitizeLinks.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("sanitize_links", checked).apply();
+            }
+        });
+
         swCheckLinksDbl.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -554,6 +564,8 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
 
         swConfirmLinks.setChecked(prefs.getBoolean("confirm_links", true));
+        swSanitizeLinks.setChecked(prefs.getBoolean("sanitize_links", false));
+        swSanitizeLinks.setEnabled(swConfirmLinks.isChecked());
         swCheckLinksDbl.setChecked(prefs.getBoolean("check_links_dbl", BuildConfig.PLAY_STORE_RELEASE));
         swCheckLinksDbl.setEnabled(swConfirmLinks.isChecked());
         swConfirmImages.setChecked(prefs.getBoolean("confirm_images", true));
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index 6919617009..bb45ca5edf 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -100,6 +100,32 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swConfirmLinks" />
 
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swSanitizeLinks"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:checked="true"
+                    android:text="@string/title_advanced_sanitize_links"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvConfirmLinksHint"
+                    app:switchPadding="12dp" />
+
+                <TextView
+                    android:id="@+id/tvSanitizeLinksHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_sanitize_links_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swSanitizeLinks" />
+
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swCheckLinksDbl"
                     android:layout_width="0dp"
@@ -109,7 +135,7 @@
                     android:text="@string/title_advanced_check_links_dbl"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvConfirmLinksHint"
+                    app:layout_constraintTop_toBottomOf="@id/tvSanitizeLinksHint"
                     app:switchPadding="12dp" />
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -350,12 +376,12 @@
                     android:layout_height="wrap_content"
                     android:drawableStart="@drawable/twotone_warning_24"
                     android:drawablePadding="6dp"
-                    app:drawableTint="?attr/colorWarning"
                     android:gravity="center"
                     android:text="@string/title_advanced_advanced"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
                     android:textColor="?attr/colorWarning"
                     android:textStyle="bold"
+                    app:drawableTint="?attr/colorWarning"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fd0298248..44d3b7ef44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -684,6 +684,8 @@
     <string name="title_advanced_caption_smime" translatable="false">S/MIME</string>
 
     <string name="title_advanced_confirm_links">Confirm opening links</string>
+    <string name="title_advanced_sanitize_links">Remove tracking parameters by default</string>
+    <string name="title_advanced_sanitize_links_hint">Only when confirming links</string>
     <string name="title_advanced_check_links_dbl">Check domain block lists for suspicious links</string>
     <string name="title_advanced_confirm_images">Show no images by default</string>
     <string name="title_advanced_ask_images">Confirm showing images</string>