From 64c04ee8a5bcf53283dc7e88af5b8c48bf10afde Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 29 May 2021 16:15:01 +0200
Subject: [PATCH] Added image links

---
 .../java/eu/faircode/email/HtmlHelper.java    | 20 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 01e6442a53..3d30b47973 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1026,10 +1026,22 @@ public class HtmlHelper {
             if (alt.length() > MAX_ALT)
                 alt = alt.substring(0, MAX_ALT) + "…";
 
-            if (!show_images && !(inline_images && isInline) && !TextUtils.isEmpty(alt))
-                if (TextUtils.isEmpty(tracking))
-                    img.appendText("[" + alt + "]");
-                else {
+            if (!show_images && !(inline_images && isInline))
+                if (TextUtils.isEmpty(tracking)) {
+                    if (TextUtils.isEmpty(alt)) {
+                        boolean linked = false;
+                        Element p = img.parent();
+                        while (p != null && !linked)
+                            if ("a".equals(p.tagName()))
+                                linked = true;
+                            else
+                                p = p.parent();
+                        if (linked)
+                            alt = context.getString(R.string.title_image_link);
+                    }
+                    if (!TextUtils.isEmpty(alt))
+                        img.appendText("[" + alt + "]");
+                } else if (!TextUtils.isEmpty(alt)) {
                     Element a = document.createElement("a");
                     a.attr("href", tracking);
                     a.text("[" + alt + "]");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7457e203ff..86f52bb896 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1474,6 +1474,7 @@
     <string name="title_hint_eml">This is a summary of the content of a raw message file. Save the raw message with the save icon in the action bar to view all content.</string>
 
     <string name="title_open_link">Open link</string>
+    <string name="title_image_link">Image 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_suspicious_link">This is a suspicious link</string>