fix current location maximumAge

mauron85 · May 28, 2018 · 515f621 · 515f621
1 parent f34f9a4
commit 515f621
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/com/marianhello/bgloc/LocationManager.java b/src/main/java/com/marianhello/bgloc/LocationManager.java
@@ -78,15 +78,16 @@ public void onPermissionDenied() {
      */
     @SuppressLint("MissingPermission")
     public Location getCurrentLocationNoCheck(int timeout, long maximumAge, boolean enableHighAccuracy) throws InterruptedException, TimeoutException {
+        final long minLocationTime = System.currentTimeMillis() - maximumAge;
         final android.location.LocationManager locationManager = (android.location.LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
 
         Location lastKnownGPSLocation = locationManager.getLastKnownLocation(android.location.LocationManager.GPS_PROVIDER);
-        if (lastKnownGPSLocation != null && lastKnownGPSLocation.getTime() <= maximumAge) {
+        if (lastKnownGPSLocation != null && lastKnownGPSLocation.getTime() >= minLocationTime) {
             return lastKnownGPSLocation;
         }
 
         Location lastKnownNetworkLocation = locationManager.getLastKnownLocation(android.location.LocationManager.NETWORK_PROVIDER);
-        if (lastKnownNetworkLocation != null && lastKnownNetworkLocation.getTime() <= maximumAge) {
+        if (lastKnownNetworkLocation != null && lastKnownNetworkLocation.getTime() >= minLocationTime) {
             return lastKnownNetworkLocation;
         }