mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-25 15:32:52 +00:00
Code Issues Releases Wiki Activity

Whitespace simplification

Browse source
This commit is contained in:
M66B 2020-05-16 17:44:25 +02:00
parent dc4eea12cf
commit da852076ce
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1827,8 +1827,6 @@ public class HtmlHelper {
for (int i = 0; i < block.size(); ) { for (int i = 0; i < block.size(); ) {
tnode = block.get(i); tnode = block.get(i);
text = tnode.getWholeText(); text = tnode.getWholeText();
if (text.contains("7,80"))
Log.i("Here");
if ("-- ".equals(text)) { if ("-- ".equals(text)) {
i++; i++;
@ -1848,6 +1846,14 @@ public class HtmlHelper {
text = text.substring(index); text = text.substring(index);
} }
// Remove multiple trailing whitespace
index = text.length() - 1;
while (isWhiteSpace(text, index) &&
(i == block.size() - 1 || index == 0 || isWhiteSpace(text, index - 1)))
index--;
text = text.substring(0, index + 1);
tnode.text(text); tnode.text(text);
if (TextUtils.isEmpty(text)) if (TextUtils.isEmpty(text))
@ -1856,27 +1862,14 @@ public class HtmlHelper {
i++; i++;
} }
// Remove trailing whitespace // Remove last trailing whitespace
int i = block.size(); if (block.size() > 0) {
while (i > 0) { tnode = block.get(block.size() - 1);
tnode = block.get(i - 1);
text = tnode.getWholeText(); text = tnode.getWholeText();
index = text.length() - 1; if (endsWithWhitespace(text)) {
if (isWhiteSpace(text, index)) { text = text.substring(0, text.length() - 1);
index--;
while (isWhiteSpace(text, index))
index--;
text = text.substring(0, index + 1);
tnode.text(text); tnode.text(text);
}
if (TextUtils.isEmpty(text))
i--;
else
break;
} else
break;
} }
if (debug) { if (debug) {