Update PlayServicesLocationManager.java (#280)

michalchudziak · Jan 4, 2024 · d249a2d · d249a2d
1 parent 9004f93
commit d249a2d
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/android/src/main/java/com/reactnativecommunity/geolocation/PlayServicesLocationManager.java b/android/src/main/java/com/reactnativecommunity/geolocation/PlayServicesLocationManager.java
@@ -6,6 +6,8 @@
 import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
+import android.content.Context;
+import android.location.LocationManager;
 
 import androidx.annotation.RequiresApi;
 
@@ -96,6 +98,9 @@ public void onLocationAvailability(LocationAvailability locationAvailability) {
 
     @Override
     public void stopObserving() {
+        if(mLocationCallback == null) {
+            return;
+        }
         mFusedLocationClient.removeLocationUpdates(mLocationCallback);
     }
 
@@ -117,10 +122,15 @@ private void checkLocationSettings(ReadableMap options, LocationCallback locatio
         LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder();
         builder.addLocationRequest(locationRequest);
         LocationSettingsRequest locationSettingsRequest = builder.build();
-
         mLocationServicesSettingsClient.checkLocationSettings(locationSettingsRequest)
                 .addOnSuccessListener(locationSettingsResponse -> requestLocationUpdates(locationRequest, locationCallback))
-                .addOnFailureListener(err -> emitError(PositionError.POSITION_UNAVAILABLE, "Location not available (FusedLocationProvider/settings)."));
+                .addOnFailureListener(err -> {
+                    if(isAnyProviderAvailable()){
+                        requestLocationUpdates(locationRequest, locationCallback);
+                        return;
+                    }
+                    emitError(PositionError.POSITION_UNAVAILABLE, "Location not available (FusedLocationProvider/settings).");
+                });
     }
 
     private void requestLocationUpdates(LocationRequest locationRequest, LocationCallback locationCallback) {
@@ -131,6 +141,15 @@ private void requestLocationUpdates(LocationRequest locationRequest, LocationCal
         }
     }
 
+    private boolean isAnyProviderAvailable() {
+        if (mReactContext == null) {
+        return false;
+        }
+        LocationManager locationManager =
+                    (LocationManager) mReactContext.getSystemService(Context.LOCATION_SERVICE);
+        return locationManager != null && (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER));
+    }
+
     private LocationCallback createSingleLocationCallback(Callback success, Callback error){
         return new LocationCallback() {
             @Override