From ba4fc168deffb08e0e6039f45857f9bb030e0dcb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 7 Jul 2019 11:11:31 +0200
Subject: [PATCH] Added remark about ipinfo.io

---
 .../main/java/eu/faircode/email/AdapterMessage.java  |  6 ++++++
 app/src/main/res/layout/dialog_open_link.xml         | 12 +++++++++++-
 app/src/main/res/values/strings.xml                  |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 621eae7a1a..97b834f2b7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -53,6 +53,7 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.ArrowKeyMovementMethod;
+import android.text.method.LinkMovementMethod;
 import android.text.style.DynamicDrawableSpan;
 import android.text.style.ImageSpan;
 import android.text.style.QuoteSpan;
@@ -3398,6 +3399,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             final CheckBox cbSecure = view.findViewById(R.id.cbSecure);
             CheckBox cbSanitize = view.findViewById(R.id.cbSanitize);
             final Button btnOwner = view.findViewById(R.id.btnOwner);
+            TextView tvOwnerRemark = view.findViewById(R.id.tvOwnerRemark);
             final ContentLoadingProgressBar pbWait = view.findViewById(R.id.pbWait);
             final TextView tvOwner = view.findViewById(R.id.tvOwner);
             final TextView tvHost = view.findViewById(R.id.tvHost);
@@ -3434,6 +3436,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     secure ? android.R.attr.textColorSecondary : R.attr.colorWarning));
             cbSecure.setTypeface(
                     secure ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
+
             cbSecure.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -3460,6 +3463,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             });
 
             cbSanitize.setVisibility(uri.equals(sanitized) ? View.GONE : View.VISIBLE);
+
             cbSanitize.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -3470,8 +3474,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
             });
 
+            tvOwnerRemark.setMovementMethod(LinkMovementMethod.getInstance());
             pbWait.setVisibility(View.GONE);
             grpOwner.setVisibility(View.GONE);
+
             btnOwner.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 6056287081..e9a485b8c4 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -85,6 +85,16 @@
         app:layout_constraintStart_toEndOf="@id/btnOwner"
         app:layout_constraintTop_toTopOf="@id/btnOwner" />
 
+    <TextView
+        android:id="@+id/tvOwnerRemark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_remark_owner"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="italic"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btnOwner" />
+
     <TextView
         android:id="@+id/tvOwnerTitle"
         android:layout_width="wrap_content"
@@ -94,7 +104,7 @@
         android:text="@string/title_ip_owner"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnOwner" />
+        app:layout_constraintTop_toBottomOf="@id/tvOwnerRemark" />
 
     <TextView
         android:id="@+id/tvHost"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a74e24805e..ca035e6b8d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -704,6 +704,7 @@
     <string name="title_sanitize_link">Remove tracking parameters</string>
     <string name="title_insecure_link">This link is insecure</string>
     <string name="title_check_owner">Check owner</string>
+    <string name="title_remark_owner">Information will be retrieved from <a href="https://ipinfo.io/">ipinfo.io</a></string>
     <string name="title_ip_owner">Owner IP address</string>
     <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>