mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-04 06:20:26 +00:00
Code Issues Releases Wiki Activity

Fixed/improved newlines

Browse source
This commit is contained in:
M66B 2020-11-06 13:37:48 +01:00
parent 213a5f944e
commit a8c222ddf6
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/eu/faircode/email/HtmlHelper.java
View file

@ -687,7 +687,7 @@ public class HtmlHelper {
case "padding-bottom": case "padding-bottom":
// https://developer.mozilla.org/en-US/docs/Web/CSS/margin // https://developer.mozilla.org/en-US/docs/Web/CSS/margin
// https://developer.mozilla.org/en-US/docs/Web/CSS/padding // https://developer.mozilla.org/en-US/docs/Web/CSS/padding
if (element.isBlock() && hasVisibleContent(element.childNodes())) { if (element.isBlock()) {
Float[] p = new Float[4]; Float[] p = new Float[4];
String[] v = value.split(" "); String[] v = value.split(" ");
@ -748,9 +748,9 @@ public class HtmlHelper {
// Remove trailing br from div // Remove trailing br from div
for (Element div : document.select("div")) for (Element div : document.select("div"))
if (div.children().select("div").size() == 0 && if (div.children().select("div").size() == 0 &&
hasVisibleContent(div.childNodes())) { hasVisibleContent(div)) {
Node last = div.childNode(div.childNodeSize() - 1); Element last = div.lastElementSibling();
if (last != null && "br".equals(last.nodeName())) if (last != null && "br".equals(last.tagName()))
last.remove(); last.remove();
} }
@ -837,7 +837,7 @@ public class HtmlHelper {
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/table // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/table
for (Element col : document.select("th,td")) { for (Element col : document.select("th,td")) {
// separate columns // separate columns
if (hasVisibleContent(col.childNodes())) if (hasVisibleContent(col))
if (col.nextElementSibling() != null) if (col.nextElementSibling() != null)
col.append(" "); col.append(" ");
@ -849,7 +849,7 @@ public class HtmlHelper {
for (Element row : document.select("tr")) { for (Element row : document.select("tr")) {
row.tagName("span"); row.tagName("span");
if (hasVisibleContent(row.childNodes())) { if (hasVisibleContent(row)) {
Element next = row.nextElementSibling(); Element next = row.nextElementSibling();
if (next != null && "tr".equals(next.tagName())) if (next != null && "tr".equals(next.tagName()))
if (text_separators && view) if (text_separators && view)
@ -1010,24 +1010,13 @@ public class HtmlHelper {
}, document); }, document);
} }
for (Element div : document.select("div")) {
boolean inline = Boolean.parseBoolean(div.attr("x-inline"));
if (inline)
div.tagName("span");
}
// Selective new lines // Selective new lines
for (Element div : document.select("div")) { for (Element div : document.select("div")) {
Node prev = div.previousSibling(); boolean inline = Boolean.parseBoolean(div.attr("x-inline"));
if (prev != null && hasVisibleContent(Arrays.asList(prev))) if (!inline && hasVisibleContent(div))
div.prependElement("br"); div.attr("x-line-after", "true");
if (hasVisibleContent(div.childNodes()))
div.appendElement("br");
}
for (Element div : document.select("div"))
div.tagName("span"); div.tagName("span");
}
for (Element e : document.select("*[x-line-before],*[x-line-after]")) { for (Element e : document.select("*[x-line-before],*[x-line-after]")) {
if ("true".equals(e.attr("x-line-before"))) { if ("true".equals(e.attr("x-line-before"))) {
@ -1377,8 +1366,8 @@ public class HtmlHelper {
return (color & 0xFFFFFF); return (color & 0xFFFFFF);
} }
private static boolean hasVisibleContent(List<Node> nodes) { private static boolean hasVisibleContent(Element root) {
for (Node node : nodes) for (Node node : root.childNodes())
if (node instanceof TextNode) { if (node instanceof TextNode) {
String text = ((TextNode) node).getWholeText(); String text = ((TextNode) node).getWholeText();
for (int i = 0; i < text.length(); i++) { for (int i = 0; i < text.length(); i++) {
@ -1386,10 +1375,10 @@ public class HtmlHelper {
if (!StringUtil.isWhitespace(kar) && kar != '\u00a0' /* nbsp */) if (!StringUtil.isWhitespace(kar) && kar != '\u00a0' /* nbsp */)
return true; return true;
} }
return true;
} else if (node instanceof Element) { } else if (node instanceof Element) {
Element element = (Element) node; Element element = (Element) node;
if (element.isBlock()) if (element.isBlock() ||
"true".equals(element.attr("x-block")))
return false; return false;
if (element.hasText()) if (element.hasText())
return true; return true;