Use granted when available

Author: zoontek

ios/Calendars/RNPermissionHandlerCalendars.mm

@@ -38,14 +38,16 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
 #if TARGET_OS_TV
   resolve(RNPermissionStatusNotAvailable);
 #else
-  EKEventStore *store = [EKEventStore new];
-
-  void (^completion)(BOOL, NSError * _Nullable) = ^(__unused BOOL granted, NSError * _Nullable error) {
+  void (^completion)(BOOL, NSError * _Nullable) = ^(BOOL granted, NSError * _Nullable error) {
     if (error != nil) {
       reject(error);
     } else {
       [RNPermissions flagAsRequested:[[self class] handlerUniqueId]];
 
+      if (granted) {
+        return resolve(RNPermissionStatusAuthorized);
+      }
+
       switch ([EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent]) {
         case EKAuthorizationStatusNotDetermined:
           return resolve(RNPermissionStatusNotDetermined);
@@ -60,6 +62,8 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
     }
   };
 
+  EKEventStore *store = [EKEventStore new];
+
   if (@available(iOS 17.0, *)) {
     [store requestFullAccessToEventsWithCompletion:completion];
   } else {

ios/CalendarsWriteOnly/RNPermissionHandlerCalendarsWriteOnly.mm

@@ -37,16 +37,16 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
 #if TARGET_OS_TV
   resolve(RNPermissionStatusNotAvailable);
 #else
-  EKEventStore *store = [EKEventStore new];
-
-  void (^completion)(BOOL, NSError * _Nullable) = ^(__unused BOOL granted, NSError * _Nullable error) {
+  void (^completion)(BOOL, NSError * _Nullable) = ^(BOOL granted, NSError * _Nullable error) {
     if (error != nil) {
       reject(error);
     } else {
-      resolve([self currentStatus]);
+      resolve(granted ? RNPermissionStatusAuthorized : [self currentStatus]);
     }
   };
 
+  EKEventStore *store = [EKEventStore new];
+
   if (@available(iOS 17.0, *)) {
     [store requestWriteOnlyAccessToEventsWithCompletion:completion];
   } else {

ios/Camera/RNPermissionHandlerCamera.mm

@@ -33,8 +33,8 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
                    rejecter:(void (^ _Nonnull)(NSError * _Nonnull))reject {
   if (@available(iOS 7.0, tvOS 17.0, *)) {
     [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo
-                             completionHandler:^(__unused BOOL granted) {
-      resolve([self currentStatus]);
+                             completionHandler:^(BOOL granted) {
+      resolve(granted ? RNPermissionStatusAuthorized : [self currentStatus]);
     }];
   } else {
     resolve([self currentStatus]);

ios/Contacts/RNPermissionHandlerContacts.mm

@@ -39,11 +39,11 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
   resolve(RNPermissionStatusNotAvailable);
 #else
   [[CNContactStore new] requestAccessForEntityType:CNEntityTypeContacts
-                                 completionHandler:^(__unused BOOL granted, NSError * _Nullable error) {
+                                 completionHandler:^(BOOL granted, NSError * _Nullable error) {
     if (error != nil && error.code != 100) { // error code 100 is permission denied
       reject(error);
     } else {
-      resolve([self currentStatus]);
+      resolve(granted ? RNPermissionStatusAuthorized : [self currentStatus]);
     }
   }];
 #endif

ios/Microphone/RNPermissionHandlerMicrophone.mm

@@ -40,17 +40,17 @@ - (RNPermissionStatus)currentStatus {
 
 - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
                    rejecter:(void (^ _Nonnull)(NSError * _Nonnull))reject {
+  void (^completion)(BOOL) = ^(BOOL granted) {
+    resolve(granted ? RNPermissionStatusAuthorized : [self currentStatus]);
+  };
+
   if (@available(iOS 17.0, tvOS 17.0, *)) {
-    [AVAudioApplication requestRecordPermissionWithCompletionHandler:^(__unused BOOL granted) {
-      resolve([self currentStatus]);
-    }];
+    [AVAudioApplication requestRecordPermissionWithCompletionHandler:completion];
   } else {
 #if TARGET_OS_TV
     resolve([self currentStatus]);
 #else
-    [[AVAudioSession sharedInstance] requestRecordPermission:^(__unused BOOL granted) {
-      resolve([self currentStatus]);
-    }];
+    [[AVAudioSession sharedInstance] requestRecordPermission:completion];
 #endif
   }
 }

ios/Reminders/RNPermissionHandlerReminders.mm

@@ -37,16 +37,16 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
 #if TARGET_OS_TV
   resolve(RNPermissionStatusNotAvailable);
 #else
-  EKEventStore *store = [EKEventStore new];
-
-  void (^completion)(BOOL, NSError * _Nullable) = ^(__unused BOOL granted, NSError * _Nullable error) {
+  void (^completion)(BOOL, NSError * _Nullable) = ^(BOOL granted, NSError * _Nullable error) {
     if (error != nil) {
       reject(error);
     } else {
-      resolve([self currentStatus]);
+      resolve(granted ? RNPermissionStatusAuthorized : [self currentStatus]);
     }
   };
 
+  EKEventStore *store = [EKEventStore new];
+
   if (@available(iOS 17.0, *)) {
     [store requestFullAccessToRemindersWithCompletion:completion];
   } else {