Merge pull request #8 from aYukoIzuhara/support-when-in-use

Support kCLAuthorizationStatusAuthorizedWhenInUse
access-company · Apr 5, 2018 · 55dc05c · 55dc05c
2 parents 6976429 + ab42669
commit 55dc05c
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/iOS/ABFBeacon/ABFBeacon.m b/iOS/ABFBeacon/ABFBeacon.m
@@ -11,6 +11,7 @@
 @interface ABFBeacon ()
 @property (nonatomic, strong) CBPeripheralManager *peripheralManager;
 @property (nonatomic, strong) CLLocationManager *locationManager;
+@property (nonatomic) CLAuthorizationStatus authStatus;
 @end
 
 @implementation ABFBeacon
@@ -67,6 +68,8 @@ - (instancetype)initSharedInstance
                                                      name:UIApplicationDidBecomeActiveNotification
                                                    object:nil];
         */
+
+        _authStatus = [CLLocationManager authorizationStatus];
     }
     return self;
 }
@@ -140,11 +143,21 @@ - (BOOL)isMonitoringCapable
 
 - (void)updateMonitoring
 {
+    CLAuthorizationStatus newStatus = [CLLocationManager authorizationStatus];
+
     if ([self isMonitoringCapable]) {
+        if ((self.authStatus == kCLAuthorizationStatusAuthorizedAlways
+             && newStatus == kCLAuthorizationStatusAuthorizedWhenInUse)
+            || (self.authStatus = kCLAuthorizationStatusAuthorizedWhenInUse
+                && newStatus == kCLAuthorizationStatusAuthorizedAlways)) {
+            [self disableMonitoring];
+        }
         [self enableMonitoring];
     } else {
         [self disableMonitoring];
     }
+
+    self.authStatus = newStatus;
 }
 
 - (void)enableMonitoring
@@ -178,7 +191,14 @@ - (void)enableMonitoringForRegion:(ABFBeaconRegion *)region
         return;
     }
 
-    [_locationManager startMonitoringForRegion:region];
+    CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
+    if (status == kCLAuthorizationStatusAuthorizedWhenInUse) {
+        if (region.rangingEnabled) {
+            [self startRanging:region];
+        }
+    } else {
+        [_locationManager startMonitoringForRegion:region];
+    }
     region.isMonitoring = YES;
 }
 
@@ -452,8 +472,10 @@ - (NSString *)locationAuthorizationStatusString:(CLAuthorizationStatus)status
             return @"Restricted";
         case kCLAuthorizationStatusDenied:
             return @"Denied";
-        case kCLAuthorizationStatusAuthorized:
-            return @"Authorized";
+        case kCLAuthorizationStatusAuthorizedAlways:
+            return @"AuthorizedAlways";
+        case kCLAuthorizationStatusAuthorizedWhenInUse:
+            return @"AuthorizedWhenInUse";
     }
     return @"";
 }