From 4d57c6356afeb641de89a6dab6cc6ad6cd775342 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 18 Nov 2022 09:47:36 +0100
Subject: [PATCH] Fixed linking of images

---
 .../main/java/eu/faircode/email/HtmlEx.java   | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlEx.java b/app/src/main/java/eu/faircode/email/HtmlEx.java
index f34bfbc734..53fd642cbd 100644
--- a/app/src/main/java/eu/faircode/email/HtmlEx.java
+++ b/app/src/main/java/eu/faircode/email/HtmlEx.java
@@ -420,26 +420,6 @@ public class HtmlEx {
                         out.append(((URLSpan) style[j]).getURL());
                         out.append("\">");
                     }
-                    if (style[j] instanceof ImageSpan) {
-                        out.append("<img src=\"");
-                        out.append(((ImageSpan) style[j]).getSource());
-                        out.append("\"");
-
-                        if (style[j] instanceof ImageSpanEx) {
-                            ImageSpanEx img = (ImageSpanEx) style[j];
-                            int w = img.getWidth();
-                            if (w > 0)
-                                out.append(" width=\"").append(w).append("\"");
-                            int h = img.getHeight();
-                            if (h > 0)
-                                out.append(" height=\"").append(h).append("\"");
-                        }
-
-                        out.append(">");
-
-                        // Don't output the dummy character underlying the image.
-                        i = next;
-                    }
                     if (style[j] instanceof AbsoluteSizeSpan) {
                         AbsoluteSizeSpan s = ((AbsoluteSizeSpan) style[j]);
                         float sizeDip = s.getSize();
@@ -475,6 +455,29 @@ public class HtmlEx {
                     }
                 }
 
+                for (int j = 0; j < style.length; j++) {
+                    if (style[j] instanceof ImageSpan) {
+                        out.append("<img src=\"");
+                        out.append(((ImageSpan) style[j]).getSource());
+                        out.append("\"");
+
+                        if (style[j] instanceof ImageSpanEx) {
+                            ImageSpanEx img = (ImageSpanEx) style[j];
+                            int w = img.getWidth();
+                            if (w > 0)
+                                out.append(" width=\"").append(w).append("\"");
+                            int h = img.getHeight();
+                            if (h > 0)
+                                out.append(" height=\"").append(h).append("\"");
+                        }
+
+                        out.append(">");
+
+                        // Don't output the dummy character underlying the image.
+                        i = next;
+                    }
+                }
+
                 withinStyle(out, text, i, next);
 
                 for (int j = style.length - 1; j >= 0; j--) {