You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2012/10/01 22:03:42 UTC
android commit: CB-1564: DroidGap.loadUrl follows a path that never
checks the white list
Updated Branches:
refs/heads/master 17a4b5155 -> 3404a6c69
CB-1564: DroidGap.loadUrl follows a path that never checks the white list
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/3404a6c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/3404a6c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/3404a6c6
Branch: refs/heads/master
Commit: 3404a6c699db82602062cab2d8eed31855341fa7
Parents: 17a4b51
Author: Simon MacDonald <si...@gmail.com>
Authored: Mon Oct 1 16:03:28 2012 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Mon Oct 1 16:03:28 2012 -0400
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaWebView.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/3404a6c6/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 106f60d..a3f5cdb 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -481,7 +481,9 @@ public class CordovaWebView extends WebView {
if (LOG.isLoggable(LOG.DEBUG) && !url.startsWith("javascript:")) {
LOG.d(TAG, ">>> loadUrlNow()");
}
- super.loadUrl(url);
+ if (this.isUrlWhiteListed(url)) {
+ super.loadUrl(url);
+ }
}
/**