From 8acc6c0d7016c17ff870f37dbdfd589a1b09fcdd Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Fri, 15 Nov 2013 19:16:19 +0100 Subject: [PATCH] disable JS on kitkat too if mDisableJs is true --- mobile/src/com/cradle/iitc_mobile/IITC_WebView.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index a94df812..5dfc2ed2 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -140,6 +140,11 @@ public class IITC_WebView extends WebView { @Override public void loadUrl(String url) { if (url.startsWith("javascript:")) { + // do nothing if script is enabled; + if (mDisableJs) { + Log.d("iitcm", "javascript injection disabled...return"); + return; + } loadJS(url.substring("javascript:".length())); } else { // force https if enabled in settings @@ -178,11 +183,6 @@ public class IITC_WebView extends WebView { return; } } - // do nothing if script is enabled; - if (mDisableJs) { - Log.d("iitcm", "javascript injection disabled...return"); - return; - } super.loadUrl("javascript:" + js); } }