f23190cf29
* Use AppGroupId from Info.plists instead of hardcoded constant
* Update script, ci & Makefile
* Update Cocoapods to 1.9.3
* Split android builds using ABI filters
* Update Fastlane deps & build scripts
* Update CI to use latests scripts
* Display app version & build number in select server screen
* Make generate scripts compatible with node < 12
* Build scripts
* add build script to package.json
* Update to use bundler 2.1.4 and CI with Xcode 12
* Fix script name for build:ios-unsigned
* Fix RN iOS scripts
* Update CI pods-dependencies step
* Add pipefail to android executor
* Update Fastlane
* Fix type in postinstall script
* update android executor and set TERM
* Fix S3 bucket name variable
* Apply suggestions from code review
Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>
* Fix master unit tests
* use requireActual in jest setup
* Jest setup to use react instead of React
Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>
(cherry picked from commit 30d4aa2a3e)
Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
47 lines
2.5 KiB
Diff
47 lines
2.5 KiB
Diff
diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m
|
|
index fe0ee2b..5bdde1d 100644
|
|
--- a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m
|
|
+++ b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m
|
|
@@ -45,7 +45,10 @@ - (id)init
|
|
{
|
|
self = [super init];
|
|
if (self) {
|
|
- [MMKV initialize];
|
|
+ NSBundle *bundle = [NSBundle mainBundle];
|
|
+ NSString *APP_GROUP_ID = [bundle objectForInfoDictionaryKey:@"AppGroupIdentifier"];
|
|
+ NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:APP_GROUP_ID].path;
|
|
+ [MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo];
|
|
secureStorage = [[SecureStorage alloc]init];
|
|
IdStore = [[IDStore alloc] initWithMMKV:[MMKV mmkvWithID:@"mmkvIdStore"]];
|
|
mmkvMap = [NSMutableDictionary dictionary];
|
|
diff --git a/node_modules/react-native-mmkv-storage/ios/SecureStorage.m b/node_modules/react-native-mmkv-storage/ios/SecureStorage.m
|
|
index 70f3a01..07e1af0 100644
|
|
--- a/node_modules/react-native-mmkv-storage/ios/SecureStorage.m
|
|
+++ b/node_modules/react-native-mmkv-storage/ios/SecureStorage.m
|
|
@@ -184,7 +184,7 @@ - (BOOL)searchKeychainCopyMatchingExists:(NSString *)identifier {
|
|
}
|
|
|
|
- (BOOL)createKeychainValue:(NSString *)value forIdentifier:(NSString *)identifier options: (NSDictionary * __nullable)options {
|
|
- CFStringRef accessible = accessibleValue(options);
|
|
+ CFStringRef accessible = secureStoreAccessibleValue(options);
|
|
NSMutableDictionary *dictionary = [self newSearchDictionary:identifier];
|
|
|
|
NSData *valueData = [value dataUsingEncoding:NSUTF8StringEncoding];
|
|
@@ -201,7 +201,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 = secureStoreAccessibleValue(options);
|
|
NSMutableDictionary *searchDictionary = [self newSearchDictionary:identifier];
|
|
NSMutableDictionary *updateDictionary = [[NSMutableDictionary alloc] init];
|
|
NSData *passwordData = [password dataUsingEncoding:NSUTF8StringEncoding];
|
|
@@ -255,7 +255,7 @@ - (void)handleAppUninstallation
|
|
|
|
|
|
|
|
-CFStringRef accessibleValue(NSDictionary *options)
|
|
+CFStringRef secureStoreAccessibleValue(NSDictionary *options)
|
|
{
|
|
if (options && options[@"accessible"] != nil) {
|
|
NSDictionary *keyMap = @{
|