Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 03:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed spacing plain text

Browse Source
This commit is contained in:
M66B
2019-11-22 20:42:45 +01:00
parent 151101ebc0
commit 86964b942d
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -691,13 +691,14 @@ public class HtmlHelper {
private int qlevel = 0; private int qlevel = 0;
private int tlevel = 0; private int tlevel = 0;
private int plevel = 0; private int plevel = 0;
private int lindex = 0;
public void head(Node node, int depth) { public void head(Node node, int depth) {
if (node instanceof TextNode) if (node instanceof TextNode)
if (plevel > 0) { if (plevel > 0) {
String[] lines = ((TextNode) node).getWholeText().split("\\r?\\n"); String[] lines = ((TextNode) node).getWholeText().split("\\r?\\n");
for (String line : lines) { for (String line : lines) {
append(line); append(line, true);
newline(); newline();
} }
} else } else
@@ -738,19 +739,31 @@ public class HtmlHelper {
} }
private void append(String text) { private void append(String text) {
append(text, false);
}
private void append(String text, boolean raw) {
if (tlevel != qlevel) { if (tlevel != qlevel) {
newline(); newline();
tlevel = qlevel; tlevel = qlevel;
} }
if (!raw && !"-- ".equals(text)) {
text = text.trim();
if (lindex > 0)
text = " " + text;
}
sb.append(text); sb.append(text);
lindex += text.length();
} }
private void newline() { private void newline() {
lindex = 0;
sb.append("\n"); sb.append("\n");
for (int i = 0; i < qlevel; i++) for (int i = 0; i < qlevel; i++)
sb.append('>'); sb.append("> ");
if (qlevel > 0)
sb.append(' ');
} }
}, JsoupEx.parse(html)); }, JsoupEx.parse(html));