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

Ensure separate line for quote expander

This commit is contained in:
M66B 2023-02-03 21:23:54 +01:00
parent d359ed2231
commit e9c567b897
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -3132,9 +3132,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
for (QuoteSpan quoteSpan : lqs) { for (QuoteSpan quoteSpan : lqs) {
int s = ssb.getSpanStart(quoteSpan); int s = ssb.getSpanStart(quoteSpan);
int e = ssb.getSpanEnd(quoteSpan); int e = ssb.getSpanEnd(quoteSpan);
if (s == 0 || s == e)
continue;
if (show_quotes) { if (show_quotes) {
ssb.insert(s > 0 ? s - 1 : s, "0"); ssb.insert(s - 1, "\n0");
ssb.setSpan( ssb.setSpan(
new DynamicDrawableSpan() { new DynamicDrawableSpan() {
@Override @Override
@ -3142,12 +3144,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return d; return d;
} }
}, },
s > 0 ? s - 1 : s, s > 0 ? s : s + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE); s, s + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
} else { } else {
for (Object span : ssb.getSpans(s, e, Object.class)) for (Object span : ssb.getSpans(s, e, Object.class))
ssb.removeSpan(span); ssb.removeSpan(span);
ssb.delete(s, e); ssb.delete(s, e);
ssb.insert(s > 0 ? s - 1 : s, "1"); ssb.insert(s - 1, "\n1");
ssb.setSpan( ssb.setSpan(
new DynamicDrawableSpan() { new DynamicDrawableSpan() {
@Override @Override
@ -3155,7 +3157,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return d; return d;
} }
}, },
s > 0 ? s - 1 : s, s > 0 ? s : s + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE); s, s + 1, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
} }
} }