Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optimize showing ref message

Browse Source
This commit is contained in:
M66B
2020-05-02 17:50:50 +02:00
parent 62bc889b12
commit a1aff11987
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4459,8 +4459,9 @@ public class FragmentCompose extends FragmentBase {
Spanned spannedRef = null;
if (!ref.isEmpty()) {
Document quote = HtmlHelper.sanitizeCompose(context, ref.outerHtml(), show_images);
Spanned spannedQuote = HtmlHelper.fromHtml(quote.html(),
Document dref = JsoupEx.parse(ref.outerHtml());
Document quote = HtmlHelper.sanitizeView(context, dref, show_images);
SpannableStringBuilder ssb = HtmlHelper.fromDocument(context, quote,
new Html.ImageGetter() {
@Override
public Drawable getDrawable(String source) {
@@ -4469,18 +4470,17 @@ public class FragmentCompose extends FragmentBase {
},
null);
SpannableStringBuilder refBuilder = new SpannableStringBuilder(spannedQuote);
QuoteSpan[] refSpans = refBuilder.getSpans(0, refBuilder.length(), QuoteSpan.class);
QuoteSpan[] refSpans = ssb.getSpans(0, ssb.length(), QuoteSpan.class);
for (QuoteSpan quoteSpan : refSpans) {
refBuilder.setSpan(
ssb.setSpan(
new StyledQuoteSpan(context, colorPrimary),
refBuilder.getSpanStart(quoteSpan),
refBuilder.getSpanEnd(quoteSpan),
ssb.getSpanStart(quoteSpan),
ssb.getSpanEnd(quoteSpan),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
refBuilder.removeSpan(quoteSpan);
ssb.removeSpan(quoteSpan);
}
spannedRef = refBuilder;
spannedRef = ssb;
}
args.putBoolean("ref_has_images", spannedRef != null &&