From 20b1303f8c5150d99d5843ccf17b6dcf7f91158c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 12 Mar 2019 11:17:40 +0000
Subject: [PATCH] Never execute Javascript

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 4 ++--
 app/src/main/res/layout/fragment_options.xml            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 672a47fc62..19af109379 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1401,7 +1401,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     .show();
         }
 
-        @SuppressLint({"SetJavaScriptEnabled", "ClickableViewAccessibility"})
+        //@SuppressLint({"SetJavaScriptEnabled"})
         private void onShowHtmlConfirmed(final TupleMessageEx message) {
             properties.setValue("html", message.id, true);
             btnHtml.setVisibility(View.GONE);
@@ -1436,7 +1436,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             webView.loadUrl("about:blank");
 
             WebSettings settings = webView.getSettings();
-            settings.setJavaScriptEnabled(true);
+            //settings.setJavaScriptEnabled(true);
             settings.setUseWideViewPort(true);
             settings.setLoadWithOverviewMode(true);
             settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING);
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 4f8202eb45..493694f706 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -449,6 +449,7 @@
             android:text="@string/title_advanced_tracking_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swTracking" />