mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling of non breaking spaces

This commit is contained in:
M66B 2020-11-02 09:34:43 +01:00
parent 7bddcbdb25
commit a8bb72aa93
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -653,6 +653,10 @@ public class HtmlHelper {
Log.i("Removing display none " + element.tagName()); Log.i("Removing display none " + element.tagName());
element.remove(); element.remove();
} }
if ("block".equals(value) || "inline-block".equals(value))
element.attr("x-block", "true");
if ("inline".equals(value) || "inline-block".equals(value)) { if ("inline".equals(value) || "inline-block".equals(value)) {
if (element.nextSibling() != null) if (element.nextSibling() != null)
element.attr("x-inline", "true"); element.attr("x-inline", "true");
@ -733,6 +737,9 @@ public class HtmlHelper {
Log.i("Style=" + sb); Log.i("Style=" + sb);
} }
} }
if (element.isBlock())
element.attr("x-block", "true");
} }
// Remove trailing br from div // Remove trailing br from div
@ -1917,7 +1924,7 @@ public class HtmlHelper {
private int plain = 0; private int plain = 0;
private List<TextNode> block = new ArrayList<>(); private List<TextNode> block = new ArrayList<>();
private String WHITESPACE = " \t\f\u00A0"; private String WHITESPACE = " \t\f";
private String WHITESPACE_NL = WHITESPACE + "\r\n"; private String WHITESPACE_NL = WHITESPACE + "\r\n";
private Pattern TRIM_WHITESPACE_NL = private Pattern TRIM_WHITESPACE_NL =
Pattern.compile("[" + WHITESPACE + "]*\\r?\\n[" + WHITESPACE + "]*"); Pattern.compile("[" + WHITESPACE + "]*\\r?\\n[" + WHITESPACE + "]*");
@ -1934,7 +1941,8 @@ public class HtmlHelper {
if ("pre".equals(element.tagName()) || if ("pre".equals(element.tagName()) ||
"true".equals(element.attr("x-plain"))) "true".equals(element.attr("x-plain")))
plain++; plain++;
if (element.isBlock()) { if (element.isBlock() ||
"true".equals(element.attr("x-block"))) {
normalizeText(block); normalizeText(block);
block.clear(); block.clear();
} }
@ -1948,7 +1956,9 @@ public class HtmlHelper {
if ("pre".equals(element.tagName()) || if ("pre".equals(element.tagName()) ||
"true".equals(element.attr("x-plain"))) "true".equals(element.attr("x-plain")))
plain--; plain--;
if (element.isBlock() || "br".equals(element.tagName())) { if (element.isBlock() ||
"true".equals(element.attr("x-block")) ||
"br".equals(element.tagName())) {
normalizeText(block); normalizeText(block);
block.clear(); block.clear();
} }