cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject [2/8] android commit: Remove whitelists from WebView classes
Date Wed, 11 Feb 2015 19:02:22 GMT
Remove whitelists from WebView classes


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/0faf2f04
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/0faf2f04
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/0faf2f04

Branch: refs/heads/unplug-whitelist-4.0.0
Commit: 0faf2f046171c4657385626cbd26ad120ff23833
Parents: dd6e42a
Author: Ian Clelland <iclelland@chromium.org>
Authored: Thu Oct 9 15:28:29 2014 -0400
Committer: Ian Clelland <iclelland@chromium.org>
Committed: Wed Feb 11 14:01:11 2015 -0500

----------------------------------------------------------------------
 framework/src/org/apache/cordova/AndroidWebView.java | 15 ---------------
 .../src/org/apache/cordova/CordovaActivity.java      |  4 ----
 framework/src/org/apache/cordova/CordovaWebView.java |  3 ---
 3 files changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0faf2f04/framework/src/org/apache/cordova/AndroidWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java
index d9f5e14..c814c66 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<PluginEntry> 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);
 
@@ -803,16 +798,6 @@ public class AndroidWebView extends WebView implements CordovaWebView
{
     }
 
     @Override
-    public Whitelist getWhitelist() {
-        return this.internalWhitelist;
-    }
-
-    @Override
-    public Whitelist getExternalWhitelist() {
-        return this.externalWhitelist;
-    }
-
-    @Override
     public CordovaPreferences getPreferences() {
         return preferences;
     }

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0faf2f04/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 0562cdd..368671d 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<PluginEntry> 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;

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0faf2f04/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 666e35e..1cb0601 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<PluginEntry> 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();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message