Fixed suppressing line breaks

5 years ago · c7b9a239e7
parent 85356f24bc
commit c7b9a239e7
1 changed files with 7 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@ -638,12 +638,16 @@ public class HtmlHelper {
        }

        // Selective new lines
-        for (Element div : document.select("div"))
-            if (!Boolean.parseBoolean(div.attr("inline")) &&
-                    div.children().select("div").size() == 0 &&
+        for (Element div : document.select("div")) {
+            boolean inline = Boolean.parseBoolean(div.attr("inline"));
+            int childs = div.childNodeSize();
+            Node last = (childs > 0 ? div.childNode(childs - 1) : null);
+            if (!inline &&
+                    (last == null || !"div".equals(last.nodeName())) &&
                    hasVisibleContent(div.childNodes())) {
                div.appendElement("br");
            }
+        }

        for (Element div : document.select("div"))
            div.tagName("span");