From 8bcc1b3163c376af6e9dd51ea403373885a34600 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 28 Aug 2018 12:52:33 +0000 Subject: [PATCH] Use Jsoup cleaner --- app/src/main/java/eu/faircode/email/HtmlHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index 4e24a205..c8d336c6 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -31,6 +31,7 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; import org.jsoup.nodes.TextNode; +import org.jsoup.safety.Whitelist; import org.jsoup.select.NodeTraversor; import org.jsoup.select.NodeVisitor; @@ -115,14 +116,13 @@ public class HtmlHelper implements NodeVisitor { public static String sanitize(Context context, String html, boolean reply) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - Document document = Jsoup.parse(html); if (prefs.getBoolean("sanitize", false)) { + Document document = Jsoup.parse(html); HtmlHelper visitor = new HtmlHelper(context, reply); NodeTraversor.traverse(visitor, document.body()); return visitor.toString(); } else { - document.getElementsByTag("style").remove(); - document.select("[style]").removeAttr("style"); + Document document = Jsoup.parse(Jsoup.clean(html, Whitelist.relaxed())); for (Element tr : document.select("tr")) tr.after("
"); return document.body().html();