From b73cd30e3eb323cab2d19cdd222505fade8fef27 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 23 Jun 2020 19:43:00 +0200
Subject: [PATCH] Show IP country flag

---
 .../eu/faircode/email/AdapterMessage.java     | 13 +++++++++++-
 app/src/main/res/layout/dialog_open_link.xml  | 20 +++++++++++++++----
 2 files changed, 28 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 1ca2a6a2c7..24c203ba61 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5579,6 +5579,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             final Button btnOwner = dview.findViewById(R.id.btnOwner);
             final TextView tvOwnerRemark = dview.findViewById(R.id.tvOwnerRemark);
             final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
+            final ImageView ivFlag = dview.findViewById(R.id.ivFlag);
             final TextView tvHost = dview.findViewById(R.id.tvHost);
             final TextView tvOwner = dview.findViewById(R.id.tvOwner);
             final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
@@ -5728,8 +5729,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                         @Override
                         protected void onExecuted(Bundle args, Pair<String, IPInfo.Organization> data) {
+                            int resid = 0;
+                            if (data.second.country != null)
+                                resid = getResources().getIdentifier(
+                                        "flag_" + data.second.country.toLowerCase(),
+                                        "drawable", getContext().getPackageName());
+                            if (resid == 0)
+                                ivFlag.setImageDrawable(null);
+                            else
+                                ivFlag.setImageResource(resid);
+
                             tvHost.setText(data.first);
-                            tvOwner.setText(data.second.name == null ? "?" : data.second.name);
+                            tvOwner.setText(TextUtils.isEmpty(data.second.name) ? "?" : data.second.name);
                             new Handler().post(new Runnable() {
                                 @Override
                                 public void run() {
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index a9e98419e9..65c4be5812 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -149,23 +149,35 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwnerRemark" />
 
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvHost"
+        <ImageView
+            android:id="@+id/ivFlag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvOwnerTitle"
+            app:srcCompat="@drawable/flag_ad" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvHost"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
             android:text="example.org"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:textColorPrimary"
+            app:layout_constraintEnd_toStartOf="@id/ivFlag"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwnerTitle" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvOwner"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
             android:text="Cloudflare"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:textColorPrimary"
+            app:layout_constraintEnd_toStartOf="@id/ivFlag"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHost" />
 
@@ -189,6 +201,6 @@
             android:id="@+id/grpOwner"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvOwnerTitle,tvHost,tvOwner" />
+            app:constraint_referenced_ids="tvOwnerTitle,ivFlag,tvHost,tvOwner" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file