seperate SecureStorage init and MMKV

Author: ammarahm-ed

ios/MMKVNative.h

@@ -0,0 +1,14 @@
+
+#if __has_include("RCTBridgeModule.h")
+#import "RCTBridgeModule.h"
+#else
+#import <React/RCTBridgeModule.h>
+#endif
+
+@interface MMKVNative : NSObject <RCTBridgeModule>
+
+@property (nonatomic, assign) BOOL setBridgeOnMainQueue;
+
+@end
+  
+

ios/MMKVStorage.mm renamed to ios/MMKVNative.mm

@@ -1,5 +1,4 @@
-#import "MMKVStorage.h"
-#import "SecureStorage.h"
+#import "MMKVNative.h"
 #import "YeetJSIUtils.h"
 
 #import <React/RCTBridge+Private.h>
@@ -12,15 +11,12 @@
 using namespace jsi;
 using namespace std;
 
-
-
-@implementation MMKVStorage
+@implementation MMKVNative
 @synthesize bridge = _bridge;
 @synthesize methodQueue = _methodQueue;
 NSString *rPath = @"";
 NSMutableDictionary *mmkvInstances;
 
-SecureStorage *secureStorage;
 
 RCT_EXPORT_MODULE()
 
@@ -144,51 +140,6 @@ void removeKeyFromIndexer(MMKV *kv, NSString* key) {
 }
 
 
-
-
-
-
-
-
-#pragma mark setSecureKey
-RCT_EXPORT_METHOD(setSecureKey: (NSString *)alias value:(NSString *)value
-                  options: (NSDictionary *)options
-                  callback:(RCTResponseSenderBlock)callback
-                  )
-{
-    
-    [secureStorage setSecureKey:alias value:value options:options callback:callback];
-    
-}
-
-#pragma mark getSecureKey
-RCT_EXPORT_METHOD(getSecureKey:(NSString *)alias
-                  callback:(RCTResponseSenderBlock)callback)
-{
-    
-    [secureStorage getSecureKey:alias callback:callback];
-    
-    
-}
-
-#pragma mark secureKeyExists
-RCT_EXPORT_METHOD(secureKeyExists:(NSString *)key
-                  callback:(RCTResponseSenderBlock)callback)
-{
-    
-    [secureStorage secureKeyExists:key callback:callback];
-    
-}
-#pragma mark removeSecureKey
-RCT_EXPORT_METHOD(removeSecureKey:(NSString *)key
-                  callback:(RCTResponseSenderBlock)callback)
-{
-    
-    [secureStorage removeSecureKey:key callback:callback];
-    
-}
-
-
 static void install(jsi::Runtime & jsiRuntime)
 {
 
@@ -736,8 +687,6 @@ - (void)setBridge:(RCTBridge *)bridge
     if (!cxxBridge.runtime) {
         return;
     }
-    
-    secureStorage = [[SecureStorage alloc]init];
     mmkvInstances = [NSMutableDictionary dictionary];
 
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
@@ -751,3 +700,4 @@ - (void)setBridge:(RCTBridge *)bridge
 
 @end
 
+

ios/MMKVStorage.h

@@ -7,7 +7,5 @@
 
 @interface MMKVStorage : NSObject <RCTBridgeModule>
 
-@property (nonatomic, assign) BOOL setBridgeOnMainQueue;
-
 @end
 

ios/MMKVStorage.m

@@ -0,0 +1,67 @@
+#import "MMKVStorage.h"
+#import "SecureStorage.h"
+
+#import <React/RCTUtils.h>
+
+
+@implementation MMKVStorage
+
+SecureStorage *secureStorage;
+
+RCT_EXPORT_MODULE()
+
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
+- (id)init
+{
+    self = [super init];
+    if (self) {
+        secureStorage = [[SecureStorage alloc]init];
+    }
+
+    return self;
+}
+
+#pragma mark setSecureKey
+RCT_EXPORT_METHOD(setSecureKey: (NSString *)alias value:(NSString *)value
+                  options: (NSDictionary *)options
+                  callback:(RCTResponseSenderBlock)callback
+                  )
+{
+    
+    [secureStorage setSecureKey:alias value:value options:options callback:callback];
+    
+}
+
+#pragma mark getSecureKey
+RCT_EXPORT_METHOD(getSecureKey:(NSString *)alias
+                  callback:(RCTResponseSenderBlock)callback)
+{
+    
+    [secureStorage getSecureKey:alias callback:callback];
+    
+    
+}
+
+#pragma mark secureKeyExists
+RCT_EXPORT_METHOD(secureKeyExists:(NSString *)key
+                  callback:(RCTResponseSenderBlock)callback)
+{
+    
+    [secureStorage secureKeyExists:key callback:callback];
+    
+}
+#pragma mark removeSecureKey
+RCT_EXPORT_METHOD(removeSecureKey:(NSString *)key
+                  callback:(RCTResponseSenderBlock)callback)
+{
+    
+    [secureStorage removeSecureKey:key callback:callback];
+    
+}
+
+@end
+