From 887ab4a28b85236101b940734001603c2199f723 Mon Sep 17 00:00:00 2001 From: filmaj Date: Tue, 23 Mar 2010 16:37:30 -0700 Subject: [PATCH] Added explicit disabling of native Geolocation object in the web client, added a fallback measure to JavaScript geolocation PhoneGap constructor so that it builds/proxies the the instantiated Geo objects properly if it still does exist. --- framework/assets/js/geolocation.js | 24 ++++++++-------- framework/src/com/phonegap/DroidGap.java | 4 ++- .../src/com/phonegap/WebViewReflect.java | 28 +++++++++++++++++-- 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/framework/assets/js/geolocation.js b/framework/assets/js/geolocation.js index 741730c8..68d069a9 100644 --- a/framework/assets/js/geolocation.js +++ b/framework/assets/js/geolocation.js @@ -73,16 +73,18 @@ Geolocation.prototype.clearWatch = function(watchId) Geo.stop(watchId); } -// Taken from Jesse's geo fix (similar problem) in PhoneGap iPhone. Go figure, same browser! -function __proxyObj(origObj, proxyObj, funkList) { - for (var v in funkList) { - origObj[funkList[v]] = proxyObj[funkList[v]]; - } -} PhoneGap.addConstructor(function() { - navigator._geo = new Geolocation(); - __proxyObj(navigator.geolocation, navigator._geo, - ["setLocation", "getCurrentPosition", "watchPosition", - "clearWatch", "setError", "start", "stop", "gotCurrentPosition"] - ); + // Taken from Jesse's geo fix (similar problem) in PhoneGap iPhone. Go figure, same browser! + function __proxyObj(origObj, proxyObj, funkList) { + for (var v in funkList) { + origObj[funkList[v]] = proxyObj[funkList[v]]; + } + } + // In case a native geolocation object exists, proxy the native one over to a diff object so that we can overwrite the native implementation. + if (typeof navigator.geolocation != 'undefined') { + navigator._geo = new Geolocation(); + __proxyObj(navigator.geolocation, navigator._geo, ["setLocation", "getCurrentPosition", "watchPosition", "clearWatch", "setError", "start", "stop", "gotCurrentPosition"]); + } else { + navigator.geolocation = new Geolocation(); + } }); \ No newline at end of file diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index 5a8bc47d..d7b44c6e 100644 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -101,7 +101,6 @@ public class DroidGap extends Activity { settings.setJavaScriptEnabled(true); settings.setJavaScriptCanOpenWindowsAutomatically(true); settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL); - Package pack = this.getClass().getPackage(); String appPackage = pack.getName(); @@ -111,6 +110,9 @@ public class DroidGap extends Activity { // Turn on DOM storage! WebViewReflect.setDomStorage(settings); + // Turn off native geolocation object in browser - we use our own :) + WebViewReflect.setGeolocationEnabled(settings, false); + /* Bind the appView object to the gap class methods */ bindBrowser(appView); if(cupcakeStorage != null) diff --git a/framework/src/com/phonegap/WebViewReflect.java b/framework/src/com/phonegap/WebViewReflect.java index ed611a2b..dbf60586 100644 --- a/framework/src/com/phonegap/WebViewReflect.java +++ b/framework/src/com/phonegap/WebViewReflect.java @@ -10,6 +10,7 @@ public class WebViewReflect { private static Method mWebSettings_setDatabaseEnabled; private static Method mWebSettings_setDatabasePath; private static Method mWebSettings_setDomStorageEnabled; + private static Method mWebSettings_setGeolocationEnabled; static { @@ -48,6 +49,8 @@ public class WebViewReflect { "setDatabasePath", new Class[] { String.class }); mWebSettings_setDomStorageEnabled = WebSettings.class.getMethod( "setDomStorageEnabled", new Class[] { boolean.class }); + mWebSettings_setGeolocationEnabled = WebSettings.class.getMethod( + "setGeolocationEnabled", new Class[] { boolean.class }); /* success, this is a newer device */ } catch (NoSuchMethodException nsme) { /* failure, must be older device */ @@ -58,9 +61,9 @@ public class WebViewReflect { if (mWebSettings_setDatabaseEnabled != null) { /* feature is supported */ try { - mWebSettings_setDatabaseEnabled.invoke(setting, true); + mWebSettings_setDatabaseEnabled.invoke(setting, enable); mWebSettings_setDatabasePath.invoke(setting, path); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (IllegalAccessException e) { @@ -75,7 +78,26 @@ public class WebViewReflect { System.out.println("Database not supported"); } } - + public static void setGeolocationEnabled(WebSettings setting, boolean enable) { + if (mWebSettings_setGeolocationEnabled != null) { + /* feature is supported */ + try { + mWebSettings_setGeolocationEnabled.invoke(setting, enable); + } catch (IllegalArgumentException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvocationTargetException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } else { + /* feature not supported, do something else */ + System.out.println("Native Geolocation not supported - we're ok"); + } + } public static void setDomStorage(WebSettings setting) { if(mWebSettings_setDomStorageEnabled != null)