Use CLLocationManager instance authorizationStatus on iOS >= 14

Author: zoontek

ios/LocationAccuracy/RNPermissionHandlerLocationAccuracy.mm

@@ -15,7 +15,9 @@ + (NSString * _Nonnull)handlerUniqueId {
 - (void)checkWithResolver:(RCTPromiseResolveBlock _Nonnull)resolve
                  rejecter:(RCTPromiseRejectBlock _Nonnull)reject {
   if (@available(iOS 14.0, tvOS 14.0, *)) {
-    switch ([CLLocationManager authorizationStatus]) {
+    CLLocationManager *manager = [CLLocationManager new];
+
+    switch ([manager authorizationStatus]) {
       case kCLAuthorizationStatusNotDetermined:
         return reject(@"cannot_check_location_accuracy", @"Location permission hasn't been requested first", nil);
       case kCLAuthorizationStatusRestricted:
@@ -43,7 +45,9 @@ - (void)requestWithPurposeKey:(NSString * _Nonnull)purposeKey
                      resolver:(RCTPromiseResolveBlock _Nonnull)resolve
                      rejecter:(RCTPromiseRejectBlock _Nonnull)reject {
   if (@available(iOS 14.0, tvOS 14.0, *)) {
-    switch ([CLLocationManager authorizationStatus]) {
+    CLLocationManager *manager = [CLLocationManager new];
+
+    switch ([manager authorizationStatus]) {
       case kCLAuthorizationStatusNotDetermined:
         return reject(@"cannot_request_location_accuracy", @"Location permission hasn't been requested first", nil);
       case kCLAuthorizationStatusRestricted:
@@ -54,21 +58,19 @@ - (void)requestWithPurposeKey:(NSString * _Nonnull)purposeKey
         break;
     }
 
-    CLLocationManager *locationManager = [CLLocationManager new];
-
-    switch (locationManager.accuracyAuthorization) {
+    switch (manager.accuracyAuthorization) {
       case CLAccuracyAuthorizationFullAccuracy:
         return resolve(@"full"); // resolve early if full accuracy is already granted
       case CLAccuracyAuthorizationReducedAccuracy:
         break;
     }
 
-    [locationManager requestTemporaryFullAccuracyAuthorizationWithPurposeKey:purposeKey
-                                                                  completion:^(NSError * _Nullable error) {
+    [manager requestTemporaryFullAccuracyAuthorizationWithPurposeKey:purposeKey
+                                                          completion:^(NSError * _Nullable error) {
       if (error) {
         reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);
       } else {
-        switch (locationManager.accuracyAuthorization) {
+        switch (manager.accuracyAuthorization) {
           case CLAccuracyAuthorizationFullAccuracy:
             return resolve(@"full");
           case CLAccuracyAuthorizationReducedAccuracy:

ios/LocationAlways/RNPermissionHandlerLocationAlways.mm

@@ -20,11 +20,16 @@ + (NSString * _Nonnull)handlerUniqueId {
   return @"ios.permission.LOCATION_ALWAYS";
 }
 
-- (RNPermissionStatus)currentStatus {
-#if TARGET_OS_TV
-  return RNPermissionStatusNotAvailable;
-#else
-  switch ([CLLocationManager authorizationStatus]) {
+- (CLAuthorizationStatus)statusWithManager:(CLLocationManager *)manager {
+  if (@available(iOS 14.0, tvOS 14.0, *)) {
+    return [manager authorizationStatus];
+  } else {
+    return [CLLocationManager authorizationStatus];
+  }
+}
+
+- (RNPermissionStatus)convertStatus:(CLAuthorizationStatus)status {
+  switch (status) {
     case kCLAuthorizationStatusNotDetermined:
       return RNPermissionStatusNotDetermined;
     case kCLAuthorizationStatusRestricted:
@@ -35,6 +40,13 @@ - (RNPermissionStatus)currentStatus {
     case kCLAuthorizationStatusAuthorizedAlways:
       return RNPermissionStatusAuthorized;
   }
+}
+
+- (RNPermissionStatus)currentStatus {
+#if TARGET_OS_TV
+  return RNPermissionStatusNotAvailable;
+#else
+  return [self convertStatus:[self statusWithManager:[CLLocationManager new]]];
 #endif
 }
 
@@ -59,15 +71,13 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
 - (void)performRequest {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
-  CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
+  CLLocationManager *manager = [CLLocationManager new];
+  CLAuthorizationStatus status = [self statusWithManager:manager];
 
   if (status != kCLAuthorizationStatusNotDetermined && status != kCLAuthorizationStatusAuthorizedWhenInUse) {
-    return _resolve([self currentStatus]);
+    return _resolve([self convertStatus:status]);
   }
 
-  _locationManager = [CLLocationManager new];
-  [_locationManager setDelegate:self];
-
   if (status == kCLAuthorizationStatusAuthorizedWhenInUse) {
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onApplicationWillResignActive)
@@ -78,6 +88,9 @@ - (void)performRequest {
     [self performSelector:@selector(onApplicationWillResignActiveCheck) withObject:nil afterDelay:0.25];
   }
 
+  _locationManager = manager;
+
+  [_locationManager setDelegate:self];
   [_locationManager requestAlwaysAuthorization];
 }
 
@@ -95,27 +108,38 @@ - (void)onApplicationWillResignActiveCheck {
   if (_observingApplicationWillResignActive) {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     _observingApplicationWillResignActive = false;
-
-    [self resolveStatus:[CLLocationManager authorizationStatus]];
+    [self resolveStatus];
   }
 }
 
 - (void)onApplicationDidBecomeActive {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [self resolveStatus:[CLLocationManager authorizationStatus]];
+  [self resolveStatus];
 }
 
+#pragma mark - iOS 14+
+- (void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager {
+  if ([manager authorizationStatus] != kCLAuthorizationStatusNotDetermined && !_observingApplicationWillResignActive) {
+    [self resolveStatus];
+  }
+}
+
+#pragma mark - iOS < 14
 - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
   if (status != kCLAuthorizationStatusNotDetermined && !_observingApplicationWillResignActive) {
-    [self resolveStatus:status];
+    [self resolveStatus];
   }
 }
 
-- (void)resolveStatus:(CLAuthorizationStatus)status {
-  if (_resolve != nil) {
-    _resolve([self currentStatus]);
-    _resolve = nil;
+- (void)resolveStatus {
+  if (_resolve != nil && _locationManager != nil) {
+    CLAuthorizationStatus status = [self statusWithManager:_locationManager];
+
     [_locationManager setDelegate:nil];
+    _locationManager = nil;
+
+    _resolve([self convertStatus:status]);
+    _resolve = nil;
   }
 }
 

ios/LocationWhenInUse/RNPermissionHandlerLocationWhenInUse.mm

@@ -19,8 +19,16 @@ + (NSString * _Nonnull)handlerUniqueId {
   return @"ios.permission.LOCATION_WHEN_IN_USE";
 }
 
-- (RNPermissionStatus)currentStatus {
-  switch ([CLLocationManager authorizationStatus]) {
+- (CLAuthorizationStatus)statusWithManager:(CLLocationManager *)manager {
+  if (@available(iOS 14.0, tvOS 14.0, *)) {
+    return [manager authorizationStatus];
+  } else {
+    return [CLLocationManager authorizationStatus];
+  }
+}
+
+- (RNPermissionStatus)convertStatus:(CLAuthorizationStatus)status {
+  switch (status) {
     case kCLAuthorizationStatusNotDetermined:
       return RNPermissionStatusNotDetermined;
     case kCLAuthorizationStatusRestricted:
@@ -33,23 +41,49 @@ - (RNPermissionStatus)currentStatus {
   }
 }
 
+- (RNPermissionStatus)currentStatus {
+  return [self convertStatus:[self statusWithManager:[CLLocationManager new]]];
+}
+
 - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
                    rejecter:(void (^ _Nonnull)(NSError * _Nonnull))reject {
-  if ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusNotDetermined) {
-    return resolve([self currentStatus]);
+  CLLocationManager *manager = [CLLocationManager new];
+  CLAuthorizationStatus status = [self statusWithManager:manager];
+
+  if (status != kCLAuthorizationStatusNotDetermined) {
+    return resolve([self convertStatus:status]);
   }
 
+  _locationManager = manager;
   _resolve = resolve;
 
-  _locationManager = [CLLocationManager new];
   [_locationManager setDelegate:self];
   [_locationManager requestWhenInUseAuthorization];
 }
 
+#pragma mark - iOS 14+
+- (void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager {
+  if ([manager authorizationStatus] != kCLAuthorizationStatusNotDetermined) {
+    [self resolveStatus];
+  }
+}
+
+#pragma mark - iOS < 14
 - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
   if (status != kCLAuthorizationStatusNotDetermined) {
+    [self resolveStatus];
+  }
+}
+
+- (void)resolveStatus {
+  if (_resolve != nil && _locationManager != nil) {
+    CLAuthorizationStatus status = [self statusWithManager:_locationManager];
+
     [_locationManager setDelegate:nil];
-    _resolve([self currentStatus]);
+    _locationManager = nil;
+
+    _resolve([self convertStatus:status]);
+    _resolve = nil;
   }
 }