Fix iOS permissions

permission_handler/ios/Classes/strategies/AudioVideoPermissionStrategy.m

@@ -59,7 +59,7 @@
         if (granted) {
         if (granted) {
             completionHandler(PermissionStatusGranted);
             completionHandler(PermissionStatusGranted);
         } else {
         } else {
-            completionHandler(PermissionStatusDenied);
+            completionHandler(PermissionStatusPermanentlyDenied);
         }
         }
     }];
     }];
 }
 }

permission_handler/ios/Classes/strategies/ContactPermissionStrategy.m

@@ -71,18 +71,9 @@
         if (granted) {
         if (granted) {
             completionHandler(PermissionStatusGranted);
             completionHandler(PermissionStatusGranted);
         } else {
         } else {
-            completionHandler(PermissionStatusDenied);
+            completionHandler(PermissionStatusPermanentlyDenied);
         }
         }
     }];
     }];
-
-
-    ABAddressBookRequestAccessWithCompletion(ABAddressBookCreate(), ^(bool granted, CFErrorRef error) {
-        if (granted) {
-            completionHandler(PermissionStatusGranted);
-        } else {
-            completionHandler(PermissionStatusDenied);
-        }
-    });
 }
 }
 
 
 + (void)requestPermissionsFromAddressBook:(PermissionStatusHandler)completionHandler {
 + (void)requestPermissionsFromAddressBook:(PermissionStatusHandler)completionHandler {
@@ -90,7 +81,7 @@
         if (granted) {
         if (granted) {
             completionHandler(PermissionStatusGranted);
             completionHandler(PermissionStatusGranted);
         } else {
         } else {
-            completionHandler(PermissionStatusDenied);
+            completionHandler(PermissionStatusPermanentlyDenied);
         }
         }
     });
     });
 }
 }

permission_handler/ios/Classes/strategies/LocationPermissionStrategy.m

@@ -138,7 +138,7 @@
         case kCLAuthorizationStatusRestricted:
         case kCLAuthorizationStatusRestricted:
             return PermissionStatusRestricted;
             return PermissionStatusRestricted;
         case kCLAuthorizationStatusDenied:
         case kCLAuthorizationStatusDenied:
-            return PermissionStatusDenied;
+            return PermissionStatusPermanentlyDenied;
         case kCLAuthorizationStatusAuthorized:
         case kCLAuthorizationStatusAuthorized:
             return PermissionStatusGranted;
             return PermissionStatusGranted;
         default:
         default:

permission_handler/ios/Classes/strategies/MediaLibraryPermissionStrategy.m

@@ -29,7 +29,7 @@
             completionHandler([MediaLibraryPermissionStrategy determinePermissionStatus:status]);
             completionHandler([MediaLibraryPermissionStrategy determinePermissionStatus:status]);
         }];
         }];
     } else {
     } else {
-        completionHandler(PermissionStatusDenied);
+        completionHandler(PermissionStatusPermanentlyDenied);
         return;
         return;
     }
     }
 }
 }

permission_handler/ios/Classes/strategies/NotificationPermissionStrategy.m

@@ -33,7 +33,7 @@
       authorizationOptions += UNAuthorizationOptionAlert;
       authorizationOptions += UNAuthorizationOptionAlert;
       authorizationOptions += UNAuthorizationOptionBadge;
       authorizationOptions += UNAuthorizationOptionBadge;
       [center requestAuthorizationWithOptions:(authorizationOptions) completionHandler:^(BOOL granted, NSError * _Nullable error) {
       [center requestAuthorizationWithOptions:(authorizationOptions) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-        if (!granted || error != nil) {
+        if (error != nil || !granted) {
           completionHandler(PermissionStatusPermanentlyDenied);
           completionHandler(PermissionStatusPermanentlyDenied);
           return;
           return;
         }
         }

permission_handler/ios/Classes/strategies/SensorPermissionStrategy.m

@@ -35,11 +35,8 @@
         
         
         NSDate *today = [NSDate new];
         NSDate *today = [NSDate new];
         [motionManager queryActivityStartingFromDate:today toDate:today toQueue:[NSOperationQueue mainQueue] withHandler:^(NSArray<CMMotionActivity *> *__nullable activities, NSError *__nullable error) {
         [motionManager queryActivityStartingFromDate:today toDate:today toQueue:[NSOperationQueue mainQueue] withHandler:^(NSArray<CMMotionActivity *> *__nullable activities, NSError *__nullable error) {
-            if (error != nil && error.code == CMErrorMotionActivityNotAuthorized) {
-                completionHandler(PermissionStatusDenied);
-            } else {
-                completionHandler(PermissionStatusGranted);
-            }
+            PermissionStatus status = [SensorPermissionStrategy permissionStatus];
+            completionHandler(status);
         }];
         }];
     } else {
     } else {
         completionHandler(PermissionStatusDenied);
         completionHandler(PermissionStatusDenied);