From 846c38f9c9c51315e29de31399ff541e57a4e180 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 19 Jul 2020 14:31:08 +0200
Subject: [PATCH] Disconnect improvements

---
 .../java/eu/faircode/email/AdapterMessage.java     |  9 +++++++--
 .../eu/faircode/email/DisconnectBlacklist.java     |  2 +-
 app/src/main/res/layout/dialog_open_link.xml       | 14 ++++++++++++--
 app/src/main/res/values/strings.xml                |  1 +
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c5c41518de..55c38b79bf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5773,6 +5773,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             final ImageButton ibDifferent = dview.findViewById(R.id.ibDifferent);
             final EditText etLink = dview.findViewById(R.id.etLink);
             final TextView tvDisconnect = dview.findViewById(R.id.tvDisconnect);
+            final TextView tvDisconnectCategories = dview.findViewById(R.id.tvDisconnectCategories);
             final ImageButton ibShare = dview.findViewById(R.id.ibShare);
             final ImageButton ibCopy = dview.findViewById(R.id.ibCopy);
             final CheckBox cbSecure = dview.findViewById(R.id.cbSecure);
@@ -5963,6 +5964,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 @Override
                 protected void onPreExecute(Bundle args) {
                     tvDisconnect.setVisibility(View.GONE);
+                    tvDisconnectCategories.setVisibility(View.GONE);
                 }
 
                 @Override
@@ -5973,8 +5975,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onExecuted(Bundle args, List<String> data) {
-                    tvDisconnect.setText(data == null ? null : TextUtils.join(", ", data));
-                    tvDisconnect.setVisibility(data == null ? View.GONE : View.VISIBLE);
+                    if (data != null) {
+                        tvDisconnectCategories.setText(TextUtils.join(", ", data));
+                        tvDisconnect.setVisibility(View.VISIBLE);
+                        tvDisconnectCategories.setVisibility(View.VISIBLE);
+                    }
                 }
 
                 @Override
diff --git a/app/src/main/java/eu/faircode/email/DisconnectBlacklist.java b/app/src/main/java/eu/faircode/email/DisconnectBlacklist.java
index 4bc69dc520..3b65452d60 100644
--- a/app/src/main/java/eu/faircode/email/DisconnectBlacklist.java
+++ b/app/src/main/java/eu/faircode/email/DisconnectBlacklist.java
@@ -38,7 +38,7 @@ import javax.net.ssl.HttpsURLConnection;
 
 public class DisconnectBlacklist {
     private final static int FETCH_TIMEOUT = 20 * 1000; // milliseconds
-    private final static String LIST = "https://raw.githubusercontent.com/mozilla-services/shavar-prod-lists/master/disconnect-blacklist.json";
+    private final static String LIST = "https://raw.githubusercontent.com/disconnectme/disconnect-tracking-protection/master/services.json";
 
     static void download(Context context) throws IOException, JSONException {
         File file = getFile(context);
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index e46c550075..ae01df1cb7 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -93,13 +93,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="Advertising, Content, Analytics, Fingerprinting, Social, Cryptomining"
+            android:text="@string/title_tracking_link"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDifferent" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvDisconnectCategories"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="Advertising, Content, Analytics, Fingerprinting, Social, Cryptomining, Disconnect"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvDisconnect" />
+
         <CheckBox
             android:id="@+id/cbSecure"
             android:layout_width="wrap_content"
@@ -109,7 +119,7 @@
             android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvDisconnect" />
+            app:layout_constraintTop_toBottomOf="@id/tvDisconnectCategories" />
 
         <CheckBox
             android:id="@+id/cbSanitize"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6af6e147db..db1906bb13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1250,6 +1250,7 @@
 
     <string name="title_open_link">Open link</string>
     <string name="title_different_link">The title and the link address are different</string>
+    <string name="title_tracking_link">This website might track you</string>
     <string name="title_link_http">Traffic will not be encrypted</string>
     <string name="title_link_https">Traffic will be encrypted</string>
     <string name="title_sanitize_link">Remove tracking parameters</string>