From 77c41d5ad0007de84eb57eccab968ba8013ed45b Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 7 Nov 2020 18:14:15 +0100 Subject: [PATCH] Paragraph fixes --- app/src/main/java/eu/faircode/email/HtmlHelper.java | 11 +++++++---- 1 file changed, 7 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 69f635b9b3..50c6131688 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -754,7 +754,8 @@ public class HtmlHelper { // Paragraphs for (Element p : document.select("p")) { - p.attr("x-paragraph", "true"); + if (p.childNodeSize() != 0) + p.attr("x-paragraph", "true"); p.tagName("div"); } @@ -2045,7 +2046,7 @@ public class HtmlHelper { text = block.get(i).getWholeText(); for (int j = 0; j < text.length(); j++) { char kar = text.charAt(j); - if (WHITESPACE.indexOf(kar) < 0 && kar != '\u00a0' /* nbsp */) { + if (WHITESPACE.indexOf(kar) < 0) { blank = false; break; } @@ -2093,7 +2094,8 @@ public class HtmlHelper { if (ssb.length() > 1 && ssb.charAt(ssb.length() - 1) != '\n') ssb.append('\n'); - if ("true".equals(element.attr("x-paragraph"))) + if ("true".equals(element.attr("x-paragraph")) && + !"false".equals(element.attr("x-line-before"))) if (ssb.length() > 2 && (ssb.charAt(ssb.length() - 2) != '\n' || ssb.charAt(ssb.length() - 1) != '\n')) @@ -2356,7 +2358,8 @@ public class HtmlHelper { if (ssb.length() > 1 && ssb.charAt(ssb.length() - 1) != '\n') ssb.append('\n'); - if ("true".equals(element.attr("x-paragraph"))) + if ("true".equals(element.attr("x-paragraph")) && + !"false".equals(element.attr("x-line-after"))) if (ssb.length() > 2 && (ssb.charAt(ssb.length() - 2) != '\n' || ssb.charAt(ssb.length() - 1) != '\n'))