From 444e0ebef88066b00dc246317245d3ae05b10e0a Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 23 Sep 2019 18:56:15 +0200 Subject: [PATCH] Simplification --- .../eu/faircode/email/ActivityCompose.java | 18 ++++++++++-------- .../eu/faircode/email/FragmentCompose.java | 3 ++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java index ed7b5120bc..f9314f5f5a 100644 --- a/app/src/main/java/eu/faircode/email/ActivityCompose.java +++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java @@ -32,9 +32,6 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.Lifecycle; -import org.jsoup.Jsoup; -import org.jsoup.safety.Whitelist; - import java.util.ArrayList; import javax.mail.internet.AddressException; @@ -143,15 +140,20 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB if (intent.hasExtra(Intent.EXTRA_HTML_TEXT)) { String html = intent.getStringExtra(Intent.EXTRA_HTML_TEXT); - if (html != null) - args.putString("body", Jsoup.clean(html, Whitelist.relaxed())); + if (!TextUtils.isEmpty(html)) + args.putString("body", html); } else if (intent.hasExtra(Intent.EXTRA_TEXT)) { CharSequence body = intent.getCharSequenceExtra(Intent.EXTRA_TEXT); if (body != null) if (body instanceof Spanned) - args.putString("body", Jsoup.clean(HtmlHelper.toHtml((Spanned) body), Whitelist.relaxed())); - else - args.putString("body", body.toString()); // TODO: clean? + args.putString("body", HtmlHelper.toHtml((Spanned) body)); + else { + String text = body.toString(); + if (!TextUtils.isEmpty(text)) { + String html = "" + text.replaceAll("\\r?\\n", "
") + ""; + args.putString("body", html); + } + } } if (intent.hasExtra(Intent.EXTRA_STREAM)) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index a231596767..73e849da50 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -2070,7 +2070,8 @@ public class FragmentCompose extends FragmentBase { data.draft.subject = args.getString("subject", ""); body = args.getString("body", ""); - body = body.replaceAll("\\r?\\n", "
"); + if (!TextUtils.isEmpty(body)) + body = HtmlHelper.sanitize(context, body, false); if (answer > 0) { EntityAnswer a = db.answer().getAnswer(answer);