incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
Date Wed, 25 Jan 2012 19:44:03 GMT
Updated Branches:
  refs/heads/master e1e04f859 -> 9206dca74


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android


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

Branch: refs/heads/master
Commit: 9206dca741b35072400572515ceeb3ff06645005
Parents: 503640f e1e04f8
Author: Joe Bowser <bowserj@apache.org>
Authored: Wed Jan 25 11:41:24 2012 -0800
Committer: Joe Bowser <bowserj@apache.org>
Committed: Wed Jan 25 11:41:24 2012 -0800

----------------------------------------------------------------------
 README.md                                          |   10 ++++
 framework/libs/junit-4.10.jar                      |  Bin 253160 -> 0 bytes
 framework/res/xml/phonegap.xml                     |   15 ++++++-
 framework/res/xml/plugins.xml                      |    1 -
 .../src/com/phonegap/CordovaChromeClient.java      |   22 +++++++++-
 .../src/com/phonegap/CordovaWebViewClient.java     |   21 +++++++++
 framework/src/com/phonegap/FileTransfer.java       |    3 +-
 framework/src/com/phonegap/KeyboardHandler.java    |   33 ---------------
 .../phonegap/LinearLayoutSoftKeyboardDetect.java   |   22 +++++++++-
 9 files changed, 88 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9206dca7/framework/res/xml/phonegap.xml
----------------------------------------------------------------------
diff --cc framework/res/xml/phonegap.xml
index ad6f329,69e4876..29476c2
--- a/framework/res/xml/phonegap.xml
+++ b/framework/res/xml/phonegap.xml
@@@ -1,6 -1,19 +1,19 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <phonegap>
-     <access origin="http://127.0.0.1*"/>
+ 	<!--  
+ 	access elements control the Android whitelist.  
+ 	Domains are assumed blocked unless set otherwise
+ 	 -->
+ 
+     <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
+ 
+ 	<!-- <access origin="https://example.com" /> allow any secure requests to example.com
-->
+ 	<!-- <access origin="https://example.com" subdomains="true" /> such as above,
but including subdomains, such as www -->
+ 	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
+ 
      <log level="DEBUG"/>
 -    <render legacy="true" />
 +    <preference name="classicRender" value="true" />
  </phonegap>
+ 
+ 
+ 


Mime
View raw message