Adguard: info button

FAQ.md

@@ -410,6 +410,7 @@ Anything on this list is in random order and *might* be added in the near future
 * [(197) How can I print a message?](#faq197)
 * [(198) Can you add spell checking?](#faq198)
 * [(199) Can you add proxy support?](#faq199)
+* [(200) How can I use Adguard to remove tracking parameters?](#faq200)
 
 [I have another question.](#get-support)
 
@@ -5634,6 +5635,21 @@ Please note that if you want to use a .onion address, you will need to disable p
 
 <br>
 
+<a name="faq200"></a>
+**(200) How can I use Adguard to remove tracking parameters?**
+
+To use [Adguard](https://adguard.com/) to remove tracking parameters from links:
+
+1. Enable confirming links in the privacy-settings tab page
+1. Download and enable [the Adguard filter list](https://github.com/AdguardTeam/FiltersRegistry), also via the privacy-settings tab page
+1. When you tap on a link, the app will check the filter list
+1. If a list entry is found for the link, the app will suggest to *Remove tracking parameters* in the confirmation dialog box
+
+Note that the Adguard filter list contains over 2,000 entries, which takes a few moments to scan,
+visible as a short delay between tapping on a link and the link confirmation dialog box appearing.
+
+<br>
+
 <h2><a name="get-support"></a>Get support</h2>
 
 &#x1F30E; [Google Translate](https://translate.google.com/translate?sl=en&u=https%3A%2F%2Fm66b.github.io%2FFairEmail%2F%23get-support)

app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java

@@ -65,6 +65,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
     private SwitchCompat swConfirmLinks;
     private SwitchCompat swSanitizeLinks;
     private SwitchCompat swAdguard;
+    private ImageButton ibAdguard;
     private Button btnAdguard;
     private TextView tvAdguardTime;
     private SwitchCompat swAdguardAutoUpdate;
@@ -139,6 +140,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
         swConfirmLinks = view.findViewById(R.id.swConfirmLinks);
         swSanitizeLinks = view.findViewById(R.id.swSanitizeLinks);
         swAdguard = view.findViewById(R.id.swAdguard);
+        ibAdguard = view.findViewById(R.id.ibAdguard);
         btnAdguard = view.findViewById(R.id.btnAdguard);
         tvAdguardTime = view.findViewById(R.id.tvAdguardTime);
         swAdguardAutoUpdate = view.findViewById(R.id.swAdguardAutoUpdate);
@@ -226,6 +228,13 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
             }
         });
 
+        ibAdguard.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 200);
+            }
+        });
+
         btnAdguard.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/res/layout/fragment_options_privacy.xml

@@ -138,17 +138,28 @@
                     app:layout_constraintTop_toBottomOf="@id/tvSanitizeLinksHint"
                     app:switchPadding="12dp" />
 
+                <ImageButton
+                    android:id="@+id/ibAdguard"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="12dp"
+                    android:contentDescription="@string/title_info"
+                    android:tooltipText="@string/title_info"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swAdguard"
+                    app:srcCompat="@drawable/twotone_info_24" />
+
                 <Button
                     android:id="@+id/btnAdguard"
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginTop="6dp"
+                    android:layout_marginTop="12dp"
                     android:drawableEnd="@drawable/twotone_get_app_24"
                     android:drawablePadding="6dp"
                     android:text="@string/title_download"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swAdguard" />
 
                 <TextView
@@ -159,7 +170,7 @@
                     android:text="December 29, 11:30 AM"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="italic"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnAdguard" />
 
                 <androidx.appcompat.widget.SwitchCompat

index.html

@@ -363,6 +363,7 @@
 <li><a href="#faq197">(197) How can I print a message?</a></li>
 <li><a href="#faq198">(198) Can you add spell checking?</a></li>
 <li><a href="#faq199">(199) Can you add proxy support?</a></li>
+<li><a href="#faq200">(200) How can I use Adguard to remove tracking parameters?</a></li>
 </ul>
 <p><a href="#get-support">I have another question.</a></p>
 <p><a name="faq1"></a> <strong>(1) Which permissions are needed and why?</strong></p>
@@ -2753,6 +2754,16 @@ adb install /path/to/FairEmail-xxx.apk</code></pre>
 <p>If you want to proxy traffic, for example to use Tor, you should use an Android VPN-service based app, which is the only way to reliably proxy traffic.</p>
 <p>Please note that if you want to use a .onion address, you will need to disable private DNS in the Android network settings.</p>
 <p><br></p>
+<p><a name="faq200"></a> <strong>(200) How can I use Adguard to remove tracking parameters?</strong></p>
+<p>To use <a href="https://adguard.com/">Adguard</a> to remove tracking parameters from links:</p>
+<ol type="1">
+<li>Enable confirming links in the privacy-settings tab page</li>
+<li>Download and enable <a href="https://github.com/AdguardTeam/FiltersRegistry">the Adguard filter list</a>, also via the privacy-settings tab page</li>
+<li>When you tap on a link, the app will check the filter list</li>
+<li>If a list entry is found for the link, the app will suggest to <em>Remove tracking parameters</em> in the confirmation dialog box</li>
+</ol>
+<p>Note that the Adguard filter list contains over 2,000 entries, which takes a few moments to scan, visible as a short delay between tapping on a link and the link confirmation dialog box appearing.</p>
+<p><br></p>
 <h2>
 <a name="get-support"></a>Get support
 </h2>