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

Plain text: apply quotes lastly

Browse Source
This commit is contained in:
M66B
2023-03-14 10:31:25 +01:00
parent e35a58c301
commit 1a2ff10849
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2764,22 +2764,6 @@ public class HtmlHelper {
}
}
// https://tools.ietf.org/html/rfc3676#section-4.5
for (QuoteSpan span : ssb.getSpans(0, ssb.length(), QuoteSpan.class)) {
int start = ssb.getSpanStart(span);
int end = ssb.getSpanEnd(span);
for (int i = end - 2; i >= start; i--)
if (ssb.charAt(i) == '\n')
if (i + 1 < ssb.length() && ssb.charAt(i + 1) == '>')
ssb.insert(i + 1, ">");
else
ssb.insert(i + 1, "> ");
if (start < ssb.length())
ssb.insert(start, ssb.charAt(start) == '>' ? ">" : "> ");
}
for (BulletSpan span : ssb.getSpans(0, ssb.length(), BulletSpan.class)) {
int start = ssb.getSpanStart(span);
if (span instanceof NumberSpan) {
@@ -2809,6 +2793,22 @@ public class HtmlHelper {
ssb.replace(start, end, LINE);
}
// https://tools.ietf.org/html/rfc3676#section-4.5
for (QuoteSpan span : ssb.getSpans(0, ssb.length(), QuoteSpan.class)) {
int start = ssb.getSpanStart(span);
int end = ssb.getSpanEnd(span);
for (int i = end - 2; i >= start; i--)
if (ssb.charAt(i) == '\n')
if (i + 1 < ssb.length() && ssb.charAt(i + 1) == '>')
ssb.insert(i + 1, ">");
else
ssb.insert(i + 1, "> ");
if (start < ssb.length())
ssb.insert(start, ssb.charAt(start) == '>' ? ">" : "> ");
}
return ssb.toString();
}