Skip to content

Commit d4b090b

Browse files
jennantillajinliu9508
authored andcommitted
Merge pull request #1940 from OneSignal/fix/catch_exception_for_location_lib
Fix: Catch IllegalStateException on call to Google's location library
2 parents 3b9e763 + 2a724bd commit d4b090b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/controller/impl/GmsLocationController.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,11 @@ internal class GmsLocationController(
231231
googleApiClient: GoogleApiClient,
232232
locationListener: LocationListener,
233233
) {
234-
LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener)
234+
if (googleApiClient.isConnected) {
235+
LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener)
236+
} else {
237+
Logging.warn("GoogleApiClient is not connected. Unable to cancel location updates.")
238+
}
235239
}
236240

237241
fun requestLocationUpdates(

0 commit comments

Comments
 (0)