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

Custom render: suppress extra newlines

This commit is contained in:
M66B 2020-04-25 11:04:12 +02:00
parent 7f6b935aea
commit bfbf4dc534
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1846,8 +1846,8 @@ public class HtmlHelper {
if (debug) {
if (block.size() > 0) {
block.get(0).text("<" + block.get(0));
block.get(block.size() - 1).text(block.get(block.size() - 1) + ">");
block.get(0).text("(" + block.get(0));
block.get(block.size() - 1).text(block.get(block.size() - 1) + ")");
}
}
}
@ -1895,7 +1895,7 @@ public class HtmlHelper {
ssb.setSpan(new QuoteSpan(), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
break;
case "br":
ssb.append("\n");
newline(ssb.length());
break;
case "em":
ssb.setSpan(new StyleSpan(Typeface.ITALIC), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@ -1909,8 +1909,8 @@ public class HtmlHelper {
int level = element.tagName().charAt(1) - '1';
ssb.setSpan(new RelativeSizeSpan(HEADING_SIZES[level]), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
ssb.insert(start, "\n");
ssb.append("\n");
newline(start);
newline(ssb.length());
break;
case "img":
String src = element.attr("src");
@ -1921,7 +1921,7 @@ public class HtmlHelper {
ssb.setSpan(new ImageSpan(d, src), start, start + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
break;
case "li":
ssb.append("\n");
newline(ssb.length());
Element parent = element.parent();
if (parent == null || "ul".equals(parent.tagName()))
// TODO BulletSpanCompat
@ -1943,8 +1943,8 @@ public class HtmlHelper {
break;
case "ol":
case "ul":
ssb.insert(start, "\n");
ssb.append("\n");
newline(start);
newline(ssb.length());
break;
case "pre":
// Do nothing
@ -1986,8 +1986,23 @@ public class HtmlHelper {
}
}
}
private void newline(int index) {
int len = ssb.length();
if (len > 2 &&
ssb.charAt(len - 1) == '\n' &&
ssb.charAt(len - 2) == '\n')
return;
ssb.insert(index, "\n");
}
}, document.body());
if (debug)
for (int i = ssb.length() - 1; i >= 0; i--)
if (ssb.charAt(i) == '\n')
ssb.insert(i, "|");
return reverseSpans(ssb);
} else
return fromHtml(document.html(), imageGetter, null);