Merge pull request #56 from jussikinnula/master

Fixed build error when used with react-native-keychain lib
talut · Dec 25, 2020 · 87db8d3 · 87db8d3
2 parents 9e7facd + 1bf530e
commit 87db8d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -24,11 +24,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 4
-<<<<<<< HEAD
-        versionName "2.0.5"
-=======
         versionName "2.0.6"
->>>>>>> 1ec951c769b9f2675ebfda3a4387c4a83251331b
     }
     lintOptions {
         abortOnError false

diff --git a/ios/RNSecureStorage.m b/ios/RNSecureStorage.m
@@ -71,7 +71,7 @@ - (BOOL)searchKeychainCopyMatchingExists:(NSString *)identifier {
 }
 
 - (BOOL)createKeychainValue:(NSString *)value forIdentifier:(NSString *)identifier options: (NSDictionary * __nullable)options {
-    CFStringRef accessible = accessibleValue(options);
+    CFStringRef accessible = [self accessibleValue:options];
     NSMutableDictionary *dictionary = [self newSearchDictionary:identifier];
 
     NSData *valueData = [value dataUsingEncoding:NSUTF8StringEncoding];
@@ -88,7 +88,7 @@ - (BOOL)createKeychainValue:(NSString *)value forIdentifier:(NSString *)identifi
 
 - (BOOL)updateKeychainValue:(NSString *)password forIdentifier:(NSString *)identifier options:(NSDictionary * __nullable)options {
 
-    CFStringRef accessible = accessibleValue(options);
+    CFStringRef accessible = [self accessibleValue:options];
     NSMutableDictionary *searchDictionary = [self newSearchDictionary:identifier];
     NSMutableDictionary *updateDictionary = [[NSMutableDictionary alloc] init];
     NSData *passwordData = [password dataUsingEncoding:NSUTF8StringEncoding];
@@ -223,7 +223,7 @@ - (void)handleAppUninstallation
     }
 }
 
-CFStringRef accessibleValue(NSDictionary *options)
+- (CFStringRef *)accessibleValue:(NSDictionary *)options
 {
     if (options && options[@"accessible"] != nil) {
         NSDictionary *keyMap = @{