Location manager crash fix when a selector is not implemented (#474)

* Fix a location manager crash when a selector is not implemented * Update changelog
mapbox · Sep 23, 2020 · 02f04de · 02f04de
1 parent eee451e
commit 02f04de
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
@@ -7,6 +7,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 ### 🐞 Bug fixes
 
 * Fixed an issue where completion blocks were not called until the map was rendered. ([#463](https://github.com/mapbox/mapbox-gl-native-ios/pull/463))
+* Fixed an issue that caused a crash when custom location managers did not implement `MGLLocationManager.accuracyAuthorization`. ([#474](https://github.com/mapbox/mapbox-gl-native-ios/pull/474))
 
 ## 6.2.0 - September 17, 2020
 

diff --git a/platform/ios/src/MGLFaux3DUserLocationAnnotationView.mm b/platform/ios/src/MGLFaux3DUserLocationAnnotationView.mm
@@ -59,7 +59,8 @@ - (void)update
     {
         if (@available(iOS 14, *)) {
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000
-            if (self.mapView.locationManager.accuracyAuthorization == CLAccuracyAuthorizationFullAccuracy) {
+            if (![self.mapView.locationManager respondsToSelector:@selector(accuracyAuthorization)] ||
+                self.mapView.locationManager.accuracyAuthorization == CLAccuracyAuthorizationFullAccuracy) {
                 [self drawPreciseLocationPuck];
             } else {
                 [self drawApproximate];

diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
@@ -6481,9 +6481,11 @@ - (void)locationManagerDidChangeAuthorization:(id<MGLLocationManager>)manager
         if (@available(iOS 14, *)) {
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000
             if (self.userTrackingMode != MGLUserTrackingModeNone &&
+                [manager respondsToSelector:@selector(authorizationStatus)] &&
                 (manager.authorizationStatus != kCLAuthorizationStatusRestricted ||
                  manager.authorizationStatus != kCLAuthorizationStatusAuthorizedAlways ||
                  manager.authorizationStatus != kCLAuthorizationStatusAuthorizedWhenInUse) &&
+                [manager respondsToSelector:@selector(accuracyAuthorization)] &&
                 manager.accuracyAuthorization == CLAccuracyAuthorizationReducedAccuracy &&
                 [self accuracyDescriptionString] != nil ) {
                 [self.locationManager requestTemporaryFullAccuracyAuthorizationWithPurposeKey:@"MGLAccuracyAuthorizationDescription"];