From 8543f43c0f5f09b04840b8859e086601c3084a36 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 24 Apr 2019 09:27:03 +0200
Subject: [PATCH] Use inline image viewer for unlinked images only

---
 .../eu/faircode/email/AdapterMessage.java     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e5cd6c0424..734e351b96 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1769,24 +1769,23 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     int line = layout.getLineForVertical(y);
                     int off = layout.getOffsetForHorizontal(line, x);
 
-                    boolean show_images = properties.getValue("images", id);
+                    URLSpan[] link = buffer.getSpans(off, off, URLSpan.class);
+                    if (link.length > 0) {
+                        String url = link[0].getURL();
+                        Uri uri = Uri.parse(url);
+                        if (uri.getScheme() == null)
+                            uri = Uri.parse("https://" + url);
+                        onOpenLink(uri);
+                        return true;
+                    }
 
+                    boolean show_images = properties.getValue("images", id);
                     if (show_images) {
                         ImageSpan[] image = buffer.getSpans(off, off, ImageSpan.class);
                         if (image.length > 0) {
                             onOpenImage(image[0].getDrawable(), image[0].getSource());
                             return true;
                         }
-                    } else {
-                        URLSpan[] link = buffer.getSpans(off, off, URLSpan.class);
-                        if (link.length > 0) {
-                            String url = link[0].getURL();
-                            Uri uri = Uri.parse(url);
-                            if (uri.getScheme() == null)
-                                uri = Uri.parse("https://" + url);
-                            onOpenLink(uri);
-                            return true;
-                        }
                     }
                 }