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

Fixed removing trailing block white space

This commit is contained in:
M66B 2021-07-04 14:07:23 +02:00
parent 774c246e33
commit 5b2b41c166
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2244,10 +2244,6 @@ public class HtmlHelper {
(i == 0 || endsWithSpace(block.get(i - 1).text()))) (i == 0 || endsWithSpace(block.get(i - 1).text())))
text = text.substring(1); text = text.substring(1);
// Conditionally remove trailing whitespace
if (i == block.size() - 1 && endsWithSpace(text))
text = text.substring(0, text.length() - 1);
tnode.text(text); tnode.text(text);
if (TextUtils.isEmpty(text)) if (TextUtils.isEmpty(text))
@ -2256,6 +2252,20 @@ public class HtmlHelper {
i++; i++;
} }
// Remove trailing whitespace
while (block.size() > 0) {
tnode = block.get(block.size() - 1);
text = tnode.getWholeText();
if (endsWithSpace(text)) {
text = text.substring(0, text.length() - 1);
tnode.text(text);
}
if (TextUtils.isEmpty(text))
block.remove(block.size() - 1);
else
break;
}
// Remove all blank blocks // Remove all blank blocks
boolean blank = true; boolean blank = true;
for (int i = 0; i < block.size(); i++) { for (int i = 0; i < block.size(); i++) {