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/30 17:20:41 UTC
[6/7] android commit: Remove whitelists from WebView classes
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/83377d36
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/83377d36
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/83377d36
Branch: refs/heads/unplug-whitelist
Commit: 83377d366a6e5021ea6beb4258644d993ebeed18
Parents: 8df2d4f
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Oct 9 15:28:29 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Oct 30 12:19:06 2014 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/AndroidWebView.java | 15 ---------------
.../src/org/apache/cordova/CordovaActivity.java | 6 +-----
framework/src/org/apache/cordova/CordovaWebView.java | 3 ---
3 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/83377d36/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 36ef39f..18859bc 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -86,8 +86,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 CordovaUriHelper helper;
// The URL passed to loadUrl(), not necessarily the URL of the current page.
@@ -112,14 +110,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;
this.helper = new CordovaUriHelper(cordova, this);
@@ -751,16 +746,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/83377d36/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 75ac729..2e69356 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -123,8 +123,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
// Read from config.xml:
protected CordovaPreferences preferences;
- protected Whitelist internalWhitelist;
- protected Whitelist externalWhitelist;
protected String launchUrl;
protected ArrayList<PluginEntry> pluginEntries;
@@ -185,8 +183,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
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;
@@ -266,7 +262,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/83377d36/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 47abfc0..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();
@@ -81,8 +80,6 @@ public interface CordovaWebView {
PluginManager getPluginManager();
- Whitelist getWhitelist();
- Whitelist getExternalWhitelist();
CordovaPreferences getPreferences();
void onFilePickerResult(Uri uri);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org