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

…ion_lib Fix: Catch IllegalStateException on call to Google's location library
OneSignal · Feb 6, 2024 · 58d4bfa · 58d4bfa
2 parents dd41509 + 4c45a24
commit 58d4bfa
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(