diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java index d9f5e149..c814c666 100755 --- a/framework/src/org/apache/cordova/AndroidWebView.java +++ b/framework/src/org/apache/cordova/AndroidWebView.java @@ -88,8 +88,6 @@ public class AndroidWebView extends WebView implements CordovaWebView { private WebChromeClient.CustomViewCallback mCustomViewCallback; private CordovaResourceApi resourceApi; - private Whitelist internalWhitelist; - private Whitelist externalWhitelist; private CordovaPreferences preferences; private CoreAndroid appPlugin; private CordovaUriHelper helper; @@ -115,14 +113,11 @@ public class AndroidWebView extends WebView implements CordovaWebView { // Use two-phase init so that the control will work with XML layouts. @Override public void init(final CordovaInterface cordova, List pluginEntries, - Whitelist internalWhitelist, Whitelist externalWhitelist, CordovaPreferences preferences) { if (this.cordova != null) { throw new IllegalStateException(); } this.cordova = cordova; - this.internalWhitelist = internalWhitelist; - this.externalWhitelist = externalWhitelist; this.preferences = preferences; this.helper = new CordovaUriHelper(cordova, this); @@ -802,16 +797,6 @@ public class AndroidWebView extends WebView implements CordovaWebView { return this; } - @Override - public Whitelist getWhitelist() { - return this.internalWhitelist; - } - - @Override - public Whitelist getExternalWhitelist() { - return this.externalWhitelist; - } - @Override public CordovaPreferences getPreferences() { return preferences; diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java index 0562cdd1..368671d0 100755 --- a/framework/src/org/apache/cordova/CordovaActivity.java +++ b/framework/src/org/apache/cordova/CordovaActivity.java @@ -94,8 +94,6 @@ public class CordovaActivity extends Activity { // Read from config.xml: protected CordovaPreferences preferences; - protected Whitelist internalWhitelist; - protected Whitelist externalWhitelist; protected String launchUrl; protected ArrayList pluginEntries; protected CordovaInterfaceImpl cordovaInterface; @@ -159,8 +157,6 @@ public class CordovaActivity extends Activity { preferences = parser.getPreferences(); preferences.setPreferencesBundle(getIntent().getExtras()); preferences.copyIntoIntentExtras(this); - internalWhitelist = parser.getInternalWhitelist(); - externalWhitelist = parser.getExternalWhitelist(); launchUrl = parser.getLaunchUrl(); pluginEntries = parser.getPluginEntries(); Config.parser = parser; diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 666e35e8..1cb06015 100644 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -13,7 +13,6 @@ public interface CordovaWebView { public static final String CORDOVA_VERSION = "4.0.0-dev"; void init(CordovaInterface cordova, List pluginEntries, - Whitelist internalWhitelist, Whitelist externalWhitelist, CordovaPreferences preferences); View getView(); @@ -81,8 +80,6 @@ public interface CordovaWebView { PluginManager getPluginManager(); - Whitelist getWhitelist(); - Whitelist getExternalWhitelist(); CordovaPreferences getPreferences(); ICordovaCookieManager getCookieManager();