mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 01:06:04 +00:00
Code Issues Releases Wiki Activity

Fixed erroneously removing spans

Browse source
This commit is contained in:
M66B 2020-08-14 09:31:53 +02:00
parent 01abec9568
commit 87d0919284
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -536,19 +536,17 @@ public class FragmentCompose extends FragmentBase {
int f = text.getSpanFlags(span);
Log.i("Style span " + s + "..." + e + " start=" + added);
if (s <= added) {
if (s <= added && added + 1 <= e) {
CharacterStyle s1 = CharacterStyle.wrap(span);
text.setSpan(s1, s, added, f);
Log.i("Style span " + s + "..." + added);
}
if (added + 1 <= e) {
CharacterStyle s2 = CharacterStyle.wrap(span);
text.setSpan(s2, added + 1, e, f);
Log.i("Style span " + (added + 1) + "..." + e);
}
text.removeSpan(span);
text.removeSpan(span);
}
}
etBody.setSelection(added);
@ -565,7 +563,6 @@ public class FragmentCompose extends FragmentBase {
if (s > 0 &&
added + 1 > s && e > added + 1 &&
text.charAt(s - 1) == '\n' && text.charAt(e - 1) == '\n') {
BulletSpan b1 = clone(span, span.getClass(), etBody.getContext());
text.setSpan(b1, s, added + 1, f);
Log.i("Span " + s + "..." + (added + 1));
@ -573,10 +570,10 @@ public class FragmentCompose extends FragmentBase {
BulletSpan b2 = clone(b1, span.getClass(), etBody.getContext());
text.setSpan(b2, added + 1, e, f);
Log.i("Span " + (added + 1) + "..." + e);
}
renum = true;
text.removeSpan(span);
renum = true;
text.removeSpan(span);
}
}
if (renum)