Enhancement/1366-prevent-crash-form-happening

geolocator_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.4.1
+
+- Adds addOnFailureListener to getSettingsClient to prevent crashes.
+
 ## 4.4.0
 
 - Adds `color` to `ForegroundNotificationConfig` to set the color of the notification icon.

geolocator_android/android/src/main/java/com/baseflow/geolocator/errors/ErrorCodes.java

@@ -4,6 +4,7 @@ public enum ErrorCodes {
   activityMissing,
   errorWhileAcquiringPosition,
   locationServicesDisabled,
+  locationServicesFailed,
   permissionDefinitionsNotFound,
   permissionDenied,
   permissionRequestInProgress;
@@ -16,6 +17,8 @@ public String toString() {
         return "ERROR_WHILE_ACQUIRING_POSITION";
       case locationServicesDisabled:
         return "LOCATION_SERVICES_DISABLED";
+      case locationServicesFailed:
+        return "LOCATION_SERVICES_FAILED";
       case permissionDefinitionsNotFound:
         return "PERMISSION_DEFINITIONS_NOT_FOUND";
       case permissionDenied:
@@ -35,6 +38,8 @@ public String toDescription() {
         return "An unexpected error occurred while trying to acquire the device's position.";
       case locationServicesDisabled:
         return "Location services are disabled. To receive location updates the location services should be enabled.";
+      case locationServicesFailed:
+        return "Location services failed.";
       case permissionDefinitionsNotFound:
         return "No location permissions are defined in the manifest. Make sure at least ACCESS_FINE_LOCATION or ACCESS_COARSE_LOCATION are defined in the manifest.";
       case permissionDenied:

geolocator_android/android/src/main/java/com/baseflow/geolocator/location/FusedLocationClient.java

@@ -28,6 +28,7 @@
 import com.google.android.gms.location.LocationSettingsStatusCodes;
 import com.google.android.gms.location.Priority;
 import com.google.android.gms.location.SettingsClient;
+import com.google.android.gms.tasks.OnFailureListener;
 
 import java.security.SecureRandom;
 
@@ -168,6 +169,13 @@ public void isLocationServiceEnabled(LocationServiceListener listener) {
               } else {
                 listener.onLocationServiceError(ErrorCodes.locationServicesDisabled);
               }
+            })
+        .addOnFailureListener(
+            new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception e) {
+                listener.onLocationServiceError(ErrorCodes.locationServicesFailed);
+              }
             });
   }
 

geolocator_android/android/src/main/java/com/baseflow/geolocator/location/LocationMapper.java

@@ -21,11 +21,11 @@ public static Map<String, Object> toHashMap(Location location) {
 
     if (location.hasAltitude()) position.put("altitude", location.getAltitude());
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && location.hasVerticalAccuracy())
-        position.put("altitude_accuracy", location.getVerticalAccuracyMeters());
+      position.put("altitude_accuracy", location.getVerticalAccuracyMeters());
     if (location.hasAccuracy()) position.put("accuracy", (double) location.getAccuracy());
     if (location.hasBearing()) position.put("heading", (double) location.getBearing());
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && location.hasBearingAccuracy())
-        position.put("heading_accuracy", location.getBearingAccuracyDegrees());
+      position.put("heading_accuracy", location.getBearingAccuracyDegrees());
     if (location.hasSpeed()) position.put("speed", (double) location.getSpeed());
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && location.hasSpeedAccuracy())
       position.put("speed_accuracy", (double) location.getSpeedAccuracyMetersPerSecond());

geolocator_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: geolocator_android
 description: Geolocation plugin for Flutter. This plugin provides the Android implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_android
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 4.4.0
+version: 4.4.1
 
 environment:
   sdk: ">=2.15.0 <4.0.0"