incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [19/50] git commit: Remove addWhiteList from public API
Date Tue, 03 Jan 2012 18:57:09 GMT
Remove addWhiteList from public API


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

Branch: refs/heads/master
Commit: e02322b66b7588e93433697493b1a4795e78227a
Parents: 853a734
Author: macdonst <simon.macdonald@gmail.com>
Authored: Sat Nov 26 07:33:06 2011 +0800
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Tue Nov 29 03:47:49 2011 +0800

----------------------------------------------------------------------
 framework/assets/js/app.js               |   10 ----------
 framework/src/com/phonegap/App.java      |   13 -------------
 framework/src/com/phonegap/DroidGap.java |    2 +-
 3 files changed, 1 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e02322b6/framework/assets/js/app.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/app.js b/framework/assets/js/app.js
index 2068458..8734cef 100755
--- a/framework/assets/js/app.js
+++ b/framework/assets/js/app.js
@@ -95,16 +95,6 @@ App.prototype.exitApp = function() {
 	return PhoneGap.exec(null, null, "App", "exitApp", []);
 };
 
-/**
- * Add entry to approved list of URLs (whitelist) that will be loaded into PhoneGap container
instead of default browser.
- * 
- * @param origin		URL regular expression to allow
- * @param subdomains	T=include all subdomains under origin
- */
-App.prototype.addWhiteListEntry = function(origin, subdomains) {
-	return PhoneGap.exec(null, null, "App", "addWhiteListEntry", [origin, subdomains]);	
-};
-
 PhoneGap.addConstructor(function() {
     navigator.app = new App();
 });

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e02322b6/framework/src/com/phonegap/App.java
----------------------------------------------------------------------
diff --git a/framework/src/com/phonegap/App.java b/framework/src/com/phonegap/App.java
index 6207434..bd56bc1 100755
--- a/framework/src/com/phonegap/App.java
+++ b/framework/src/com/phonegap/App.java
@@ -70,9 +70,6 @@ public class App extends Plugin {
         	else if (action.equals("exitApp")) {
             	this.exitApp();
             }
-        	else if (action.equals("addWhiteListEntry")) {
-        		this.addWhiteListEntry(args.getString(0), args.optBoolean(1));
-        	}
             return new PluginResult(status, result);
         } catch (JSONException e) {
             return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
@@ -198,14 +195,4 @@ public class App extends Plugin {
     public void exitApp() {
     	((DroidGap)this.ctx).endActivity();
     }
-
-    /**
-     * Add entry to approved list of URLs (whitelist)
-     * 
-     * @param origin		URL regular expression to allow
-     * @param subdomains	T=include all subdomains under origin
-     */
-    public void addWhiteListEntry(String origin, boolean subdomains) {
-    	((DroidGap)this.ctx).addWhiteListEntry(origin, subdomains);
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e02322b6/framework/src/com/phonegap/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 218c473..6a0a061 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -1767,7 +1767,7 @@ public class DroidGap extends PhonegapActivity {
      * @param origin        URL regular expression to allow
      * @param subdomains    T=include all subdomains under origin
      */
-    public void addWhiteListEntry(String origin, boolean subdomains) {
+    private void addWhiteListEntry(String origin, boolean subdomains) {
       try {
         // Unlimited access to network resources
         if(origin.compareTo("*") == 0) {


Mime
View raw message