From b297fe6f597358713fb2dbf70253d54552f25283 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Wed, 8 Aug 2012 23:39:02 -0400 Subject: [PATCH] Fix a NPE in GeoBroker when there is no previous location. --- framework/src/org/apache/cordova/GeoBroker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/org/apache/cordova/GeoBroker.java b/framework/src/org/apache/cordova/GeoBroker.java index 05c427d9..9b0838b8 100755 --- a/framework/src/org/apache/cordova/GeoBroker.java +++ b/framework/src/org/apache/cordova/GeoBroker.java @@ -75,7 +75,7 @@ public class GeoBroker extends Plugin { int maximumAge = args.getInt(1); Location last = this.locationManager.getLastKnownLocation((enableHighAccuracy ? LocationManager.GPS_PROVIDER : LocationManager.NETWORK_PROVIDER)); // Check if we can use lastKnownLocation to get a quick reading and use less battery - if ((System.currentTimeMillis() - last.getTime()) <= maximumAge) { + if (last != null && (System.currentTimeMillis() - last.getTime()) <= maximumAge) { result = new PluginResult(PluginResult.Status.OK, this.returnLocationJSON(last)); } else { this.getCurrentLocation(callbackId, enableHighAccuracy);