incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [3/3] android commit: CB-1101: Specifying Jellybean means that we have to override the default CORS policy
Date Tue, 31 Jul 2012 20:41:34 GMT
CB-1101: Specifying Jellybean means that we have to override the default CORS policy


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/79feb6d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/79feb6d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/79feb6d5

Branch: refs/heads/master
Commit: 79feb6d5d2db8a89cf558351ebe882ed77d41612
Parents: a29b8e5
Author: Joe Bowser <bowserj@apache.org>
Authored: Tue Jul 31 11:48:38 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Tue Jul 31 11:48:38 2012 -0700

----------------------------------------------------------------------
 .../src/org/apache/cordova/CordovaWebView.java     |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/79feb6d5/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 30b65b3..18d3e50 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -191,6 +191,11 @@ public class CordovaWebView extends WebView {
         //Set the nav dump for HTC 2.x devices (disabling for ICS/Jellybean)
         if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
             settings.setNavDump(true);
+        
+        //Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
+        //while we do this
+        if(android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
+            settings.setAllowUniversalAccessFromFileURLs(true);
 
         // Enable database
         settings.setDatabaseEnabled(true);


Mime
View raw message