Merge pull request #757 from Lee-sungheon/master

Fix build issue due to limited contact permission
morenoh149 · Oct 15, 2024 · ffddfd2 · ffddfd2
2 parents bf46da1 + c809039
commit ffddfd2
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -353,7 +353,7 @@ The thumbnailPath is the direct URI for the temp location of the contact's cropp
 Usage as follows:
 ```js
 Contacts.checkPermission().then(permission => {
-  // Contacts.PERMISSION_AUTHORIZED || Contacts.PERMISSION_UNDEFINED || Contacts.PERMISSION_DENIED
+  // Contacts.PERMISSION_AUTHORIZED || Contacts.PERMISSION_UNDEFINED || Contacts.PERMISSION_LIMITED || Contacts.PERMISSION_DENIED
   if (permission === 'undefined') {
     Contacts.requestPermission().then(permission => {
       // ...

diff --git a/ios/RCTContacts/RCTContacts.mm b/ios/RCTContacts/RCTContacts.mm
@@ -60,12 +60,15 @@ - (NSDictionary *)constantsToExport
     rejecter:(RCTPromiseRejectBlock) __unused reject)
 {
     CNAuthorizationStatus authStatus = [CNContactStore authorizationStatusForEntityType:CNEntityTypeContacts];
+
     if (authStatus == CNAuthorizationStatusDenied || authStatus == CNAuthorizationStatusRestricted){
         resolve(@"denied");
     } else if (authStatus == CNAuthorizationStatusAuthorized){
         resolve(@"authorized");
-    } else if (authStatus == CNAuthorizationStatusLimited) {
-        resolve(@"limited");
+    } else if(@available(iOS 18, *)) {
+        if (authStatus == CNAuthorizationStatusLimited) {
+            resolve(@"limited");
+        }
     } else {
         resolve(@"undefined");
     }
@@ -568,10 +571,17 @@ - (NSString *)getPathForDirectory:(int)directory
             }
         }];
     }
-    else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited)
+    else if([CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
     {
         resolve([self getFilePathForThumbnailImage:recordID addressBook:contactStore]);
     }
+    else if(@available(iOS 18, *))
+    {
+        if([CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited)
+        {
+            resolve([self getFilePathForThumbnailImage:recordID addressBook:contactStore]);
+        }
+    }
 }
 
 -(NSString *) getFilePathForThumbnailImage:(NSString *)recordID
@@ -606,10 +616,17 @@ -(NSString *) getFilePathForThumbnailImage:(NSString *)recordID
             }
         }];
     }
-    else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited))
+    else if([CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
     {
         resolve([self getContact:recordID addressBook:contactStore withThumbnails:false]);
     }
+    else if(@available(iOS 18, *))
+    {
+        if([CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited)
+        {
+            resolve([self getContact:recordID addressBook:contactStore withThumbnails:false]);
+        }
+    }
 }
 
 -(NSDictionary *) getContact:(NSString *)recordID
@@ -1288,8 +1305,10 @@ - (void)checkPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseReject
          resolve(@"denied");
      } else if (authStatus == CNAuthorizationStatusAuthorized){
          resolve(@"authorized");
-     } else if (authStatus == CNAuthorizationStatusLimited) {
-         resolve(@"limited");
+     } else if(@available(iOS 18, *)) {
+         if (authStatus == CNAuthorizationStatusLimited) {
+             resolve(@"limited");
+         }
      } else {
          resolve(@"undefined");
      }
@@ -1440,10 +1459,17 @@ - (void)getContactById:(nonnull NSString *)recordID resolve:(RCTPromiseResolveBl
              }
          }];
      }
-     else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited))
+     else if([CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
      {
          resolve([self getContact:recordID addressBook:contactStore withThumbnails:false]);
      }
+     else if(@available(iOS 18, *))
+     {
+        if([CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited)
+        {
+            resolve([self getContact:recordID addressBook:contactStore withThumbnails:false]);
+        }
+     }
  }
 
 
@@ -1490,10 +1516,18 @@ - (void)getPhotoForId:(nonnull NSString *)recordID resolve:(RCTPromiseResolveBlo
                 }
             }];
         }
-        else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited))
+        else if([CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
         {
             resolve([self getFilePathForThumbnailImage:recordID addressBook:contactStore]);
         }
+        else if(@available(iOS 18, *))
+        {
+            if([CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited)
+            {
+                resolve([self getFilePathForThumbnailImage:recordID addressBook:contactStore]);
+            }
+
+        }
  }