Prevent a NPE when checking the location age

christianrowlands · Dec 4, 2024 · 9d365cb · 9d365cb
1 parent 3896c17
commit 9d365cb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/networksurvey/src/main/java/com/craxiom/networksurvey/GpsListener.java b/networksurvey/src/main/java/com/craxiom/networksurvey/GpsListener.java
@@ -136,8 +136,10 @@ public void onProviderDisabled(@NonNull String provider)
         }
     }
 
-    public Location getLatestLocation()
+    public synchronized Location getLatestLocation()
     {
+        if (latestLocation == null) return null;
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
         {
             long locationTimeAge = latestLocation.getElapsedRealtimeAgeMillis();
@@ -160,7 +162,7 @@ public Location getLatestLocation()
      *
      * @param newLocation The newly provided location.
      */
-    private void updateLocation(Location newLocation)
+    private synchronized void updateLocation(Location newLocation)
     {
         latestLocation = newLocation;