From 440cac41e80c4d9f464a59449fa1de4d8c26c876 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 15 Mar 2019 08:01:52 +0000 Subject: [PATCH] Prevent crash --- .../java/eu/faircode/email/HtmlHelper.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index 1527ff2155..6f707442aa 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -226,7 +226,8 @@ public class HtmlHelper { // Split parent link and linked image boolean linked = false; for (Element parent : img.parents()) - if ("a".equals(parent.tagName()) && !TextUtils.isEmpty(parent.attr("href"))) { + if ("a".equals(parent.tagName()) && + !TextUtils.isEmpty(parent.attr("href"))) { String text = parent.attr("title").trim(); if (TextUtils.isEmpty(text)) text = parent.attr("alt").trim(); @@ -235,18 +236,20 @@ public class HtmlHelper { img.remove(); parent.appendText(text); + String outer = parent.outerHtml(); + + parent.tagName("span"); + parent.html(outer); + parent.appendChild(div); - Element span = document.createElement("span"); - span.appendChild(parent.clone()); - span.appendChild(div); - parent.replaceWith(span); linked = true; - break; } - if (!linked) - img.replaceWith(div); + if (!linked) { + img.tagName("div"); + img.html(div.html()); + } } // Autolink