Experiment: remove conditional HTML

5 years ago · a812f52e80
parent 8208709840
commit a812f52e80
1 changed files with 28 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@ -43,12 +43,14 @@ import androidx.core.util.PatternsCompat;
 import androidx.preference.PreferenceManager;

 import org.jsoup.nodes.Attribute;
+import org.jsoup.nodes.Comment;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 import org.jsoup.nodes.TextNode;
 import org.jsoup.safety.Cleaner;
 import org.jsoup.safety.Whitelist;
+import org.jsoup.select.NodeFilter;
 import org.jsoup.select.NodeTraversor;
 import org.jsoup.select.NodeVisitor;

@ -257,6 +259,32 @@ public class HtmlHelper {

        Document parsed = JsoupEx.parse(html);

+        // <!--[if ...]><!--> ... <!--<![endif]-->
+        if (!display_hidden && BuildConfig.DEBUG)
+            parsed.filter(new NodeFilter() {
+                private boolean remove = false;
+
+                @Override
+                public FilterResult head(Node node, int depth) {
+                    if (node instanceof Comment) {
+                        String data = ((Comment) node).getData().trim();
+                        if (data.startsWith("[if") && !data.endsWith("endif]")) {
+                            remove = true;
+                            return FilterResult.REMOVE;
+                        } else if (remove && data.endsWith("endif]")) {
+                            remove = false;
+                            return FilterResult.REMOVE;
+                        }
+                    }
+                    return (remove ? FilterResult.REMOVE : FilterResult.CONTINUE);
+                }
+
+                @Override
+                public FilterResult tail(Node node, int depth) {
+                    return FilterResult.CONTINUE;
+                }
+            });
+
        // <html xmlns:v="urn:schemas-microsoft-com:vml"
        //   xmlns:o="urn:schemas-microsoft-com:office:office"
        //   xmlns:w="urn:schemas-microsoft-com:office:word"