From 28880d2a57a6534107e559e9eb049550a540df1d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 24 Jun 2020 09:30:17 +0200
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 3 +--
 app/src/main/java/eu/faircode/email/IPInfo.java         | 2 +-
 app/src/main/java/eu/faircode/email/ViewImageHint.java  | 2 +-
 app/src/main/res/layout/dialog_open_link.xml            | 2 +-
 4 files changed, 4 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 6c637ad145..75830b090d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5734,14 +5734,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                 resid = getResources().getIdentifier(
                                         "flag_" + data.second.country.toLowerCase(Locale.ROOT),
                                         "drawable", getContext().getPackageName());
+
                             if (resid == 0)
                                 ivFlag.setImageDrawable(null);
                             else
                                 ivFlag.setImageResource(resid);
 
                             ivFlag.setContentDescription(data.second.country);
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                                ivFlag.setTooltipText(data.second.country);
 
                             tvHost.setText(data.first);
                             tvOwner.setText(TextUtils.isEmpty(data.second.name) ? "?" : data.second.name);
diff --git a/app/src/main/java/eu/faircode/email/IPInfo.java b/app/src/main/java/eu/faircode/email/IPInfo.java
index 5f247447bc..00887e4509 100644
--- a/app/src/main/java/eu/faircode/email/IPInfo.java
+++ b/app/src/main/java/eu/faircode/email/IPInfo.java
@@ -85,7 +85,7 @@ public class IPInfo {
             organization.name = jinfo.optString("org");
             organization.country = jinfo.optString("country");
         } catch (JSONException ex) {
-            Log.w(ex);
+            throw new IOException(ex);
         } finally {
             connection.disconnect();
         }
diff --git a/app/src/main/java/eu/faircode/email/ViewImageHint.java b/app/src/main/java/eu/faircode/email/ViewImageHint.java
index 69ad6c964c..da92c21b3f 100644
--- a/app/src/main/java/eu/faircode/email/ViewImageHint.java
+++ b/app/src/main/java/eu/faircode/email/ViewImageHint.java
@@ -45,7 +45,7 @@ public class ViewImageHint extends AppCompatImageView implements View.OnLongClic
             String title = getContentDescription().toString();
             if (!TextUtils.isEmpty(title)) {
                 int[] pos = new int[2];
-                getLocationInWindow(pos);
+                getLocationOnScreen(pos);
 
                 Toast toast = ToastEx.makeText(getContext(), title, Toast.LENGTH_LONG);
                 toast.setGravity(Gravity.TOP | Gravity.START, pos[0], pos[1]);
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index c43d2c8a82..f06873948b 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -149,7 +149,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwnerRemark" />
 
-        <ImageView
+        <eu.faircode.email.ViewImageHint
             android:id="@+id/ivFlag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"