Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 010F217483 for ; Fri, 24 Oct 2014 20:18:33 +0000 (UTC) Received: (qmail 67130 invoked by uid 500); 24 Oct 2014 20:18:32 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 67050 invoked by uid 500); 24 Oct 2014 20:18:32 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 66832 invoked by uid 99); 24 Oct 2014 20:18:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2014 20:18:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 628AE313F94; Fri, 24 Oct 2014 20:18:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ian@apache.org To: commits@cordova.apache.org Date: Fri, 24 Oct 2014 20:18:42 -0000 Message-Id: <62b6c7cd80b149a2adf1d27cd044c35e@git.apache.org> In-Reply-To: <71e7233e8845432db22dabd454a95b78@git.apache.org> References: <71e7233e8845432db22dabd454a95b78@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/12] 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/a8e67d4a Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a8e67d4a Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a8e67d4a Branch: refs/heads/unplug-whitelist Commit: a8e67d4ab43bf72ec5092be2d395edfb5065f0c5 Parents: 9293484 Author: Ian Clelland Authored: Thu Oct 9 15:28:29 2014 -0400 Committer: Ian Clelland Committed: Wed Oct 22 16:33:10 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/a8e67d4a/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 1d152d1..50ca43a 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; // The URL passed to loadUrl(), not necessarily the URL of the current page. String loadedUrl; @@ -111,14 +109,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 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); @@ -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/a8e67d4a/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 93309f0..dbad992 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 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/a8e67d4a/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 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