From 0d18eb966af9480a535647479a5b35c91153bfd2 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 13 Jul 2021 11:13:53 -0400 Subject: [PATCH] Fix keychain patch --- ....3.5.patch => react-native-fast-image+8.3.6.patch} | 0 patches/react-native-keychain+7.0.0.patch | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) rename patches/{react-native-fast-image+8.3.5.patch => react-native-fast-image+8.3.6.patch} (100%) diff --git a/patches/react-native-fast-image+8.3.5.patch b/patches/react-native-fast-image+8.3.6.patch similarity index 100% rename from patches/react-native-fast-image+8.3.5.patch rename to patches/react-native-fast-image+8.3.6.patch diff --git a/patches/react-native-keychain+7.0.0.patch b/patches/react-native-keychain+7.0.0.patch index 7b24ab157..68ee59cd0 100644 --- a/patches/react-native-keychain+7.0.0.patch +++ b/patches/react-native-keychain+7.0.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/react-native-keychain/RNKeychainManager/RNKeychainManager.m b/node_modules/react-native-keychain/RNKeychainManager/RNKeychainManager.m -index 38ccdf3..3c80299 100644 +index 38ccdf3..bf0dae3 100644 --- a/node_modules/react-native-keychain/RNKeychainManager/RNKeychainManager.m +++ b/node_modules/react-native-keychain/RNKeychainManager/RNKeychainManager.m -@@ -272,6 +272,37 @@ SecAccessControlCreateFlags accessControlValue(NSDictionary *options) +@@ -272,6 +272,36 @@ SecAccessControlCreateFlags accessControlValue(NSDictionary *options) return SecItemDelete((__bridge CFDictionaryRef) query); } @@ -25,10 +25,9 @@ index 38ccdf3..3c80299 100644 + result = (__bridge NSArray*)(resultRef); + if (result != NULL) { + for (id entry in result) { -+ NSMutableData *serverData = [entry objectForKey:(__bridge NSString *)kSecAttrServer]; ++ NSString *serverData = [entry objectForKey:(__bridge NSString *)kSecAttrServer]; + if (serverData != NULL) { -+ NSString *server = [[NSString alloc] initWithData:serverData encoding:NSUTF8StringEncoding]; -+ [servers addObject:server]; ++ [servers addObject:serverData]; + } + } + } @@ -40,7 +39,7 @@ index 38ccdf3..3c80299 100644 -(NSArray*)getAllServicesForSecurityClasses:(NSArray *)secItemClasses { NSMutableDictionary *query = [NSMutableDictionary dictionaryWithObjectsAndKeys: -@@ -592,4 +623,14 @@ RCT_EXPORT_METHOD(getAllGenericPasswordServices:(RCTPromiseResolveBlock)resolve +@@ -592,4 +622,14 @@ RCT_EXPORT_METHOD(getAllGenericPasswordServices:(RCTPromiseResolveBlock)resolve } }