You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2014/07/31 17:17:57 UTC
[1/2] android commit: Extend whitelist to handle URLs without // chars
Repository: cordova-android
Updated Branches:
refs/heads/master c2cafb4b4 -> 3d191d588
Extend whitelist to handle URLs without // chars
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/955133f1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/955133f1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/955133f1
Branch: refs/heads/master
Commit: 955133f1737cb9352de8c20fd22b30967fc4e1f9
Parents: c2cafb4
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Jun 26 15:48:50 2014 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jul 31 08:11:40 2014 -0700
----------------------------------------------------------------------
framework/src/org/apache/cordova/Whitelist.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/955133f1/framework/src/org/apache/cordova/Whitelist.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Whitelist.java b/framework/src/org/apache/cordova/Whitelist.java
index ecbb7f6..5101ec3 100644
--- a/framework/src/org/apache/cordova/Whitelist.java
+++ b/framework/src/org/apache/cordova/Whitelist.java
@@ -124,15 +124,15 @@ public class Whitelist {
whiteList = null;
}
else { // specific access
- Pattern parts = Pattern.compile("^((\\*|[A-Za-z-]+)://)?(\\*|((\\*\\.)?[^*/:]+))?(:(\\d+))?(/.*)?");
+ Pattern parts = Pattern.compile("^((\\*|[A-Za-z-]+):(//)?)?(\\*|((\\*\\.)?[^*/:]+))?(:(\\d+))?(/.*)?");
Matcher m = parts.matcher(origin);
if (m.matches()) {
String scheme = m.group(2);
- String host = m.group(3);
+ String host = m.group(4);
// Special case for two urls which are allowed to have empty hosts
if (("file".equals(scheme) || "content".equals(scheme)) && host == null) host = "*";
- String port = m.group(7);
- String path = m.group(8);
+ String port = m.group(8);
+ String path = m.group(9);
if (scheme == null) {
// XXX making it stupid friendly for people who forget to include protocol/SSL
whiteList.add(new URLPattern("http", host, port, path));
[2/2] android commit: CB-7238: Minor band-aid to get tests running
again, this has to go away before 3.6.0 is released,
since this is an API change.
Posted by bo...@apache.org.
CB-7238: Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/3d191d58
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/3d191d58
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/3d191d58
Branch: refs/heads/master
Commit: 3d191d5884ef66d97cbf89bd1347cf2da1d4dacf
Parents: 955133f
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Jul 31 08:17:31 2014 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jul 31 08:17:31 2014 -0700
----------------------------------------------------------------------
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/3d191d58/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
index 06070cc..f9382d9 100644
--- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -47,6 +47,9 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
setContentView(R.layout.main);
+ //CB-7238: This has to be added now, because it got removed from somewhere else
+ Config.init(this);
+
cordovaWebView = (CordovaWebView) findViewById(R.id.cordovaWebView);
Config.init(this);
cordovaWebView.init(this, new CordovaWebViewClient(this, cordovaWebView), new CordovaChromeClient(this, cordovaWebView),