mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Restoration

Browse source
This commit is contained in:
M66B 2020-11-07 12:45:18 +01:00
parent 60391752f0
commit fc7cf6e9d6
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2233,6 +2233,11 @@ public class HtmlHelper {
break;
case "div": // compose
case "p": // compose
if (!"true".equals(element.attr("x-block")) &&
!"true".equals(element.attr("x-paragraph"))) {
newline(ssb.length());
newline(ssb.length());
}
break;
case "i":
case "em":
@ -2252,6 +2257,10 @@ public class HtmlHelper {
int level = element.tagName().charAt(1) - '1';
setSpan(ssb, new RelativeSizeSpan(HEADING_SIZES[level]), start, ssb.length());
setSpan(ssb, new StyleSpan(Typeface.BOLD), start, ssb.length());
if (!"true".equals(element.attr("x-block"))) {
newline(start);
newline(ssb.length());
}
break;
case "hr":
if (text_separators) {
@ -2416,6 +2425,25 @@ public class HtmlHelper {
else
Log.e("Invalid span " + start + "..." + end + " len=" + len + " type=" + span.getClass().getName());
}
private void newline(int index) {
int count = 0;
if (compress) {
int i = Math.min(index, ssb.length() - 1);
while (i >= 0) {
char kar = ssb.charAt(i);
if (kar == '\n')
count++;
else if (kar != ' ' && kar != '\u00A0')
break;
i--;
}
}
if (count < 2)
ssb.insert(index, "\n");
}
}, document.body());
if (debug)