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 2015/09/23 21:58:46 UTC

[35/45] android commit: Finally got it kinda working, Geolocation is not going to work in browser anymore

Finally got it kinda working, Geolocation is not going to work in browser anymore


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e62696e7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e62696e7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e62696e7

Branch: refs/heads/5.0.x
Commit: e62696e72e36a62304f39ecf3a8fae5148a36072
Parents: d3044f3
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jul 14 14:58:55 2015 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Sep 21 18:09:24 2015 -0700

----------------------------------------------------------------------
 framework/src/org/apache/cordova/CordovaPlugin.java              | 4 +++-
 .../src/org/apache/cordova/engine/SystemWebChromeClient.java     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e62696e7/framework/src/org/apache/cordova/CordovaPlugin.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaPlugin.java b/framework/src/org/apache/cordova/CordovaPlugin.java
index 8ca1dd1..6cb2a3c 100644
--- a/framework/src/org/apache/cordova/CordovaPlugin.java
+++ b/framework/src/org/apache/cordova/CordovaPlugin.java
@@ -41,7 +41,7 @@ public class CordovaPlugin {
     public CordovaInterface cordova;
     protected CordovaPreferences preferences;
     private String serviceName;
-    private String [] permissions;
+    protected String [] permissions;
 
     /**
      * Call this after constructing to initialize the plugin.
@@ -387,6 +387,8 @@ public class CordovaPlugin {
                 return false;
             }
         }
+
+        return true;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e62696e7/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
index 8c02bfa..bca847b 100755
--- a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
@@ -183,7 +183,7 @@ public class SystemWebChromeClient extends WebChromeClient {
         super.onGeolocationPermissionsShowPrompt(origin, callback);
         callback.invoke(origin, true, false);
         //Get the plugin, it should be loaded
-        CordovaPlugin geolocation = parentEngine.pluginManager.getPlugin("org.apache.cordova.geolocation.PermissionHandler");
+        CordovaPlugin geolocation = parentEngine.pluginManager.getPlugin("Geolocation");
         if(geolocation != null && !geolocation.hasPermisssion())
         {
             parentEngine.pluginManager.requestPermission(geolocation);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org