Browse Source

Merge branch 'master' of https://github.com/joshblour/react-native-permissions

* 'master' of https://github.com/joshblour/react-native-permissions:
  use indexOf for list
  change back the deployment target setting
  fix for iOS 8: includes is undefined
  fix iOS 8 compling errors

# Conflicts:
#	ReactNativePermissions.js
Yonah Forst 9 years ago
parent
commit
f432ba6d7c
3 changed files with 9 additions and 4 deletions
  1. 3 2
      ReactNativePermissions.js
  2. 4 1
      permissions/RNPContacts.m
  3. 2 1
      permissions/RNPPhoto.m

+ 3 - 2
ReactNativePermissions.js

@@ -56,8 +56,9 @@ class ReactNativePermissions {
 		return RNPTypes[Platform.OS];
 	}
 
+
 	getPermissionStatus(permission) {
-		if (this.getPermissionTypes().includes(permission)) {
+  	if (RNPTypes.indexOf(permission) >= 0) {
 			return RNPermissions.getPermissionStatus(permission)
 		} else {
 			return Promise.reject(`ReactNativePermissions: ${permission} is not a valid permission type on ${Platform.OS}`)
@@ -106,4 +107,4 @@ class ReactNativePermissions {
 	}
 }
 
-module.exports = new ReactNativePermissions()
+module.exports = new ReactNativePermissions()

+ 4 - 1
permissions/RNPContacts.m

@@ -59,7 +59,10 @@
 #else
     CFErrorRef error = nil;
     ABAddressBookRef addressBook = ABAddressBookCreateWithOptions(nil, &error);
-    ABAddressBookRequestAccessWithCompletion(addressBook, completionHandler);
+    ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) {
+        NSError *err = (__bridge NSError *)error;
+        handler(granted, err);
+    });
 #endif
 }
 

+ 2 - 1
permissions/RNPPhoto.m

@@ -7,6 +7,7 @@
 //
 
 #import "RNPPhoto.h"
+#import <AddressBook/AddressBook.h>
 #import <AssetsLibrary/AssetsLibrary.h>
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_9_0
@@ -59,7 +60,7 @@
 #else
     ALAssetsLibrary *library = [[ALAssetsLibrary alloc] init];
     [library enumerateGroupsWithTypes:ALAssetsGroupSavedPhotos usingBlock:^(ALAssetsGroup *group, BOOL *stop) {
-        handler()
+        handler();
         *stop = YES;
     } failureBlock:^(NSError *error) {
         handler();