From c7b9a239e76049039cc146b16bea594676a61b02 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 6 Feb 2020 10:35:35 +0100 Subject: [PATCH] Fixed suppressing line breaks --- app/src/main/java/eu/faircode/email/HtmlHelper.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index 6d85de85e9..fa69a77378 100644 --- 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");