Update cancelLocationUpdates to check for googleApiClient connection …

…instead of try/catch
OneSignal · Dec 14, 2023 · 6e23387 · 6e23387
1 parent ebc7ea2
commit 6e23387
Showing 1 changed file with 15 additions and 7 deletions.
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
@@ -227,14 +227,22 @@ internal class GmsLocationController(
     }
 
     internal object FusedLocationApiWrapper {
-        fun cancelLocationUpdates(
-            googleApiClient: GoogleApiClient,
-            locationListener: LocationListener,
-        ) {
-            try {
+//        fun cancelLocationUpdates(
+//            googleApiClient: GoogleApiClient,
+//            locationListener: LocationListener,
+//        ) {
+//            try {
+//                LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener)
+//            } catch (e: IllegalStateException) {
+//                Logging.warn("Caught IllegalStateException in cancelLocationUpdates", e)
+//            }
+//        }
+
+        fun cancelLocationUpdates(googleApiClient: GoogleApiClient, locationListener: LocationListener) {
+            if (googleApiClient.isConnected) {
                 LocationServices.FusedLocationApi.removeLocationUpdates(googleApiClient, locationListener)
-            } catch (e: IllegalStateException) {
-                Logging.warn("Caught IllegalStateException in cancelLocationUpdates", e)
+            } else {
+                Logging.warn("GoogleApiClient is not connected. Unable to cancel location updates.")
             }
         }