From 986dbfcac9d58555ddb24f31f60b6e9293c0dba8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 21 May 2019 17:38:48 +0200
Subject: [PATCH] Show/print full original message

---
 .../java/eu/faircode/email/ActivityView.java  |  1 -
 .../eu/faircode/email/AdapterMessage.java     |  1 -
 .../java/eu/faircode/email/HtmlHelper.java    | 27 -------------------
 3 files changed, 29 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 585ebf5909..879e0c2223 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1251,7 +1251,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
                 String html = Helper.readText(file);
                 html = HtmlHelper.getHtmlEmbedded(context, id, html);
-                html = HtmlHelper.removeTracking(context, html);
 
                 return new String[]{message.subject, html};
             }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ea2656ad0f..ac2d4e2902 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1761,7 +1761,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         OriginalMessage original = new OriginalMessage();
                         original.html = Helper.readText(file);
                         original.html = HtmlHelper.getHtmlEmbedded(context, id, original.html);
-                        original.html = HtmlHelper.removeTracking(context, original.html);
 
                         Document doc = Jsoup.parse(original.html);
                         original.has_images = (doc.select("img").size() > 0);
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 89f5e315c3..bc8c4c7a50 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -84,33 +84,6 @@ public class HtmlHelper {
 
     private static final ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
 
-    static String removeTracking(Context context, String html) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean paranoid = prefs.getBoolean("paranoid", true);
-        if (!paranoid)
-            return html;
-
-        Document document = Jsoup.parse(html);
-
-        // Remove tracking pixels
-        for (Element img : document.select("img"))
-            if (isTrackingPixel(img))
-                img.removeAttr("src");
-
-        // Remove Javascript
-        for (Element e : document.select("*"))
-            for (Attribute a : e.attributes()) {
-                String v = a.getValue();
-                if (v != null && v.trim().toLowerCase().startsWith("javascript:"))
-                    e.removeAttr(a.getKey());
-            }
-
-        // Remove scripts
-        document.select("script").remove();
-
-        return document.outerHtml();
-    }
-
     static String sanitize(Context context, String html) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean paranoid = prefs.getBoolean("paranoid", true);