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

Improved plain text formatting

This commit is contained in:
M66B 2019-09-07 08:22:46 +02:00
parent d9a55ce0b2
commit e439d38ca6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,17 +637,27 @@ public class HtmlHelper {
NodeTraversor.traverse(new NodeVisitor() { NodeTraversor.traverse(new NodeVisitor() {
private int qlevel = 0; private int qlevel = 0;
private int tlevel = 0; private int tlevel = 0;
private int plevel = 0;
private boolean nl = true; private boolean nl = true;
public void head(Node node, int depth) { public void head(Node node, int depth) {
if (node instanceof TextNode) if (node instanceof TextNode)
append(((TextNode) node).text()); if (plevel > 0) {
String[] lines = ((TextNode) node).getWholeText().split("\\r?\\n");
for (String line : lines) {
append(line);
newline();
}
} else
append(((TextNode) node).text());
else { else {
String name = node.nodeName(); String name = node.nodeName();
if ("li".equals(name)) if ("li".equals(name))
append("*"); append("*");
else if ("blockquote".equals(name)) else if ("blockquote".equals(name))
qlevel++; qlevel++;
else if ("pre".equals(name))
plevel++;
if (heads.contains(name)) if (heads.contains(name))
newline(); newline();
@ -666,6 +676,8 @@ public class HtmlHelper {
newline(); newline();
} else if ("blockquote".equals(name)) } else if ("blockquote".equals(name))
qlevel--; qlevel--;
else if ("pre".equals(name))
plevel--;
if (tails.contains(name)) if (tails.contains(name))
newline(); newline();