Merge pull request #1940 from OneSignal/fix/catch_exception_for_locat…

…ion_lib Fix: Catch IllegalStateException on call to Google's location library
OneSignal · Jan 31, 2024 · d4b090b · d4b090b
2 parents 3b9e763 + 2a724bd
commit d4b090b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...on/src/main/java/com/onesignal/location/internal/controller/impl/GmsLocationController.kt b/...on/src/main/java/com/onesignal/location/internal/controller/impl/GmsLocationController.kt
@@ -231,7 +231,11 @@ internal class GmsLocationController(
             googleApiClient: GoogleApiClient,
             locationListener: LocationListener,
         ) {
-            LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener)
+            if (googleApiClient.isConnected) {
+                LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener)
+            } else {
+                Logging.warn("GoogleApiClient is not connected. Unable to cancel location updates.")
+            }
         }
 
         fun requestLocationUpdates(