You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/10/14 23:23:54 UTC
[07/11] android commit: Remove whitelists from WebView constructors
Remove whitelists from WebView constructors
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/dd7aa72d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/dd7aa72d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/dd7aa72d
Branch: refs/heads/unplug-whitelist
Commit: dd7aa72d85ef30669697dd73257f8929ac6b7672
Parents: 7530eee
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Oct 9 15:30:57 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Tue Oct 14 13:48:59 2014 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/AndroidWebView.java | 3 ---
framework/src/org/apache/cordova/CordovaActivity.java | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 1 -
3 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dd7aa72d/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 fb9cda0..fbe7d2c 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -111,14 +111,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(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;
pluginManager = new PluginManager(this, this.cordova, pluginEntries);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dd7aa72d/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 e065a9b..0aea8de 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -266,7 +266,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
// If all else fails, return a default WebView
ret = new AndroidWebView(this);
}
- ret.init(this, pluginEntries, internalWhitelist, externalWhitelist, preferences);
+ ret.init(this, pluginEntries, preferences);
return ret;
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dd7aa72d/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 5184939..91ed494 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org