@applicaster/quick-brick-native-apple 5.14.2 → 5.15.0-alpha.2

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "5.14.2",
+  "version": "5.15.0-alpha.2",
   "platforms": {
     "ios": "12.0",
     "tvos": "12.0"
@@ -16,7 +16,7 @@
   "authors": "Applicaster LTD.",
   "source": {
     "git": "https://github.com/applicaster/Zapp-Frameworks.git",
-    "tag": "@@applicaster/quick-brick-native-apple/5.14.2"
+    "tag": "@@applicaster/quick-brick-native-apple/5.15.0-alpha.2"
   },
   "requires_arc": true,
   "source_files": "universal/**/*.{m,swift}",

package/apple/universal/ReactNative/LocalNotification/LocalNotificationBridge.swift

@@ -13,6 +13,8 @@ import ZappCore
 class LocalNotificationBridge: NSObject, RCTBridgeModule {
     let kModuleName = "LocalNotificationBridge"
     let LocalNotificationRecievedEvent = "localNotificationReceived"
+    let kErrorCodeFailedToScheduleLocalNotification = "FAILED_TO_SCHEDULE_LOCAL_NOTIFICATION"
+    let kErrorCodeFailedToCancelLocalNotifications = "FAILED_TO_CANCEL_LOCAL_NOTIFICATION"
 
     static func moduleName() -> String! {
         return "LocalNotificationBridge"
@@ -22,54 +24,42 @@ class LocalNotificationBridge: NSObject, RCTBridgeModule {
         true
     }
 
-    /// prefered thread on which to run this native module
-    @objc public var methodQueue: DispatchQueue {
-        return DispatchQueue.main
-    }
-    
-    struct Errors {
-        static let failedToScheduleLocalNotificationCode = "FAILED_TO_SCHEDULE_LOCAL_NOTIFICATION"
-        static let failedToCancelLocalNotifications = "FAILED_TO_CANCEL_LOCAL_NOTIFICATION"
-    }
-
     @objc func cancelLocalNotifications(_ identifiers: [String]?,
                                         resolver: @escaping RCTPromiseResolveBlock,
                                         rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let identifiers = identifiers else {
-            rejecter(Errors.failedToCancelLocalNotifications,
-                     nil,
-                     nil)
-            return
-        }
-
-        FacadeConnector.connector?.localNotification?.cancel(for: identifiers, completion: { result in
-            switch result {
-            case let .success(value):
-                resolver(value)
-            case let .failure(error):
-                rejecter(Errors.failedToCancelLocalNotifications,
+        DispatchQueue.main.async {
+            guard let identifiers = identifiers else {
+                rejecter(self.kErrorCodeFailedToCancelLocalNotifications,
                          nil,
-                         error)
+                         nil)
+                return
             }
-        })
+
+            FacadeConnector.connector?.localNotification?.cancelLocalNotifications(identifiers,
+                                                                                   completion: { success, error in
+                                                                                       success && error == nil ? resolver(success) :
+                                                                                           rejecter(self.kErrorCodeFailedToCancelLocalNotifications,
+                                                                                                    nil,
+                                                                                                    error)
+            })
+        }
     }
 
     @objc public func presentLocalNotification(_ payload: [AnyHashable: Any]?,
                                                resolver: @escaping RCTPromiseResolveBlock,
                                                rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let payload = payload as [AnyHashable: Any]? else {
-            return
-        }
-
-        FacadeConnector.connector?.localNotification?.present(with: payload, completion: { result in
-            switch result {
-            case let .success(value):
-                resolver(value)
-            case let .failure(error):
-                rejecter(Errors.failedToScheduleLocalNotificationCode,
-                         nil,
-                         error)
+        DispatchQueue.main.async {
+            guard let payload = payload as [AnyHashable: Any]? else {
+                return
             }
-        })
+
+            FacadeConnector.connector?.localNotification?.presentLocalNotification(payload,
+                                                                                   completion: { isScheduled, error in
+                                                                                       isScheduled && error == nil ? resolver(isScheduled) :
+                                                                                           rejecter(self.kErrorCodeFailedToScheduleLocalNotification,
+                                                                                                    nil,
+                                                                                                    error)
+            })
+        }
     }
 }

package/apple/universal/ReactNative/OfflineAssetsBridge.swift

@@ -19,16 +19,6 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         static let url = "url"
     }
 
-    struct Errors {
-        static let failedToFetchCode = "failed to fetch files"
-        static let failedToFetchBody = "files arrray is empty"
-        static let unableToGetDirPathCode = "unable to get directory path"
-        static let failedToDeleteFileCode = "failed to delete file"
-        static let filePathNotProvidedBody = "File path was not provided"
-        static let fileNotExitstAtPathBody = "File not exists at path: "
-        static let failedToDeleteFileAtPathBody = "Failed to delete file at path: "
-    }
-
     static func moduleName() -> String! {
         return "OfflineAssetsBridge"
     }
@@ -54,8 +44,8 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         let dispatchGroup = DispatchGroup()
 
         guard let files = filesList, files.count > 0 else {
-            rejecter(Errors.failedToFetchCode,
-                     Errors.failedToFetchBody,
+            rejecter("failed to fetch files",
+                     "files arrray is empty",
                      nil)
             return
         }
@@ -83,7 +73,7 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         }
 
         dispatchGroup.notify(queue: .main) { [unowned self] in
-            let responseObj = self.tasks.map { ["\($0.saveTo.absoluteString)": $0.state == .completed ? true : false] }
+            let responseObj = self.tasks.map { ["\($0.saveTo.absoluteString)": $0.state == .completed ? true : false ] }
             resolver(responseObj)
         }
     }
@@ -95,7 +85,7 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         if let folderUrl = FileManager.default.getContentFolder(appendingFolderName: folderName) {
             resolver(folderUrl.relativePath)
         } else {
-            rejecter(Errors.unableToGetDirPathCode,
+            rejecter("unable to get directory path",
                      "",
                      nil)
         }
@@ -108,16 +98,16 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         let fileManager = FileManager.default
 
         guard let path = path else {
-            rejecter(Errors.failedToDeleteFileCode,
-                     Errors.filePathNotProvidedBody,
+            rejecter("failed to delete file",
+                     "File path was not provided",
                      nil)
             return
         }
 
         let url = URL(fileURLWithPath: path.replacingOccurrences(of: "file://", with: ""))
         guard fileManager.fileExists(atPath: url.path) == true else {
-            rejecter(Errors.failedToDeleteFileCode,
-                     Errors.fileNotExitstAtPathBody + String(describing: path),
+            rejecter("failed to delete file",
+                     "File not exists at path: \(String(describing: path))",
                      nil)
             return
         }
@@ -132,8 +122,8 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         if success {
             resolver(true)
         } else {
-            rejecter(Errors.failedToDeleteFileCode,
-                     Errors.failedToDeleteFileAtPathBody + path,
+            rejecter("failed to delete file",
+                     "Failed to delete file at path: \(path)",
                      nil)
         }
     }

package/apple/universal/ReactNative/PluginsManagerBridge.swift

@@ -11,6 +11,12 @@ import ZappCore
 
 @objc(PluginsManagerBridge)
 class PluginsManagerBridge: NSObject, RCTBridgeModule {
+    let noIdentifierErrorCode = "error_identifier_empty"
+    let noIdentifierErrorBody = "Plugin identifier is nil"
+
+    let noTypeErrorCode = "error_type_empty"
+    let noTypeErrorBody = "Plugin types is nil"
+
     static func moduleName() -> String! {
         return "PluginsManager"
     }
@@ -23,38 +29,21 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
     @objc public var methodQueue: DispatchQueue {
         return DispatchQueue.main
     }
-    
-    struct Errors {
-        static let noIdentifierCode = "error_identifier_empty"
-        static let noIdentifierBody = "Plugin identifier is nil"
-        static let noTypeCode = "error_type_empty"
-        static let noTypeBody = "Plugin types is nil"
-        static let disablePluginCode = "disable_plugin"
-        static let disablePluginBody = "Failed to disable plugin with id: "
-        static let enablePluginCode = "enable_plugin"
-        static let enablePluginBody = "Failed to enable plugin with id: "
-        static let isPluginEnabledCode = "check_enabled_plugin"
-        static let isPluginEnabledBody = "Failed to check plugin enabled state with id: "
-        static let disablePluginsCode = "disable_all_plugins"
-        static let disablePluginsBody = "Failed to disable all plugins with type: "
-        static let enablePluginsCode = "enable_all_plugins"
-        static let enablePluginsBody = "Failed to enable all plugins with type: "
-    }
 
     @objc public func isPluginEnabled(_ identifier: String?,
                                       resolver: @escaping RCTPromiseResolveBlock,
                                       rejecter: @escaping RCTPromiseRejectBlock) {
         guard let identifier = identifier else {
-            rejecter(Errors.noIdentifierCode,
-                     Errors.noIdentifierBody,
+            rejecter(noIdentifierErrorCode,
+                     noIdentifierErrorBody,
                      nil)
             return
         }
         if let value = FacadeConnector.connector?.pluginManager?.isPluginEnabled(identifier: identifier) {
             resolver(value)
         } else {
-            rejecter(Errors.isPluginEnabledCode,
-                     Errors.isPluginEnabledBody+identifier,
+            rejecter("enable_plugins",
+                     "Failed to check plugin enabled state with id:\(identifier)",
                      nil)
         }
     }
@@ -63,8 +52,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
                                     resolver: @escaping RCTPromiseResolveBlock,
                                     rejecter: @escaping RCTPromiseRejectBlock) {
         guard let identifier = identifier else {
-            rejecter(Errors.noIdentifierCode,
-                     Errors.noIdentifierBody,
+            rejecter(noIdentifierErrorCode,
+                     noIdentifierErrorBody,
                      nil)
             return
         }
@@ -72,8 +61,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
             if success {
                 resolver(true)
             } else {
-                rejecter(Errors.disablePluginCode,
-                         Errors.disablePluginBody+identifier,
+                rejecter("disable_plugins",
+                         "Failed to enable plugin with id:\(identifier)",
                          nil)
             }
         })
@@ -83,8 +72,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
                                         resolver: @escaping RCTPromiseResolveBlock,
                                         rejecter: @escaping RCTPromiseRejectBlock) {
         guard let pluginType = pluginType else {
-            rejecter(Errors.noTypeCode,
-                     Errors.noTypeBody,
+            rejecter(noTypeErrorCode,
+                     noTypeErrorBody,
                      nil)
             return
         }
@@ -92,8 +81,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
             if success {
                 resolver(true)
             } else {
-                rejecter(Errors.disablePluginsCode,
-                         Errors.disablePluginsBody+pluginType,
+                rejecter("disable_all_plugins",
+                         "Failed to disable all plugins with type:\(pluginType)",
                          nil)
             }
 
@@ -104,8 +93,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
                                    resolver: @escaping RCTPromiseResolveBlock,
                                    rejecter: @escaping RCTPromiseRejectBlock) {
         guard let identifier = identifier else {
-            rejecter(Errors.noIdentifierCode,
-                     Errors.noIdentifierBody,
+            rejecter(noIdentifierErrorCode,
+                     noIdentifierErrorBody,
                      nil)
             return
         }
@@ -114,8 +103,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
                                                                    if success {
                                                                        resolver(true)
                                                                    } else {
-                                                                       rejecter(Errors.enablePluginCode,
-                                                                                Errors.enablePluginBody+identifier,
+                                                                       rejecter("enable_plugins",
+                                                                                "Failed to enable plugin with id:\(identifier)",
                                                                                 nil)
                                                                    }
 
@@ -126,8 +115,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
                                        resolver: @escaping RCTPromiseResolveBlock,
                                        rejecter: @escaping RCTPromiseRejectBlock) {
         guard let pluginType = pluginType else {
-            rejecter(Errors.noTypeCode,
-                     Errors.noTypeBody,
+            rejecter(noTypeErrorCode,
+                     noTypeErrorBody,
                      nil)
             return
         }
@@ -136,8 +125,8 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
                                                                        if success {
                                                                            resolver(true)
                                                                        } else {
-                                                                           rejecter(Errors.enablePluginsCode,
-                                                                                    Errors.enablePluginsBody+pluginType,
+                                                                           rejecter("enable_all_plugins",
+                                                                                    "Failed to enable all plugins with type:\(pluginType)",
                                                                                     nil)
                                                                        }
 

package/apple/universal/ReactNative/ReactNativeCommunicationModule.swift

@@ -9,6 +9,7 @@
 import Foundation
 import os.log
 import React
+import ZappCore
 
 let kQuickBrickCommunicationModule = "QuickBrickCommunicationModule"
 
@@ -16,6 +17,16 @@ let kQuickBrickCommunicationModule = "QuickBrickCommunicationModule"
  Events Supported by the QuickBrickManager native module
  In order to add events, add a case, and add the invoke the appropriate handler in the invokeHandler method
  */
+
+struct ReactNativeCommunicationModuleError {
+    public static let errorCode = "ReactNativeCommunicationModuleError"
+    public static let languageIsUndefined = "Language value is undefined"
+    public static let languageIsEmpty = "Language value is empty"
+    public static let localStorageNotAccessible = "Can not access Local Storage"
+    public static let unableToSaveToLocalStorage = "Unable to save value to Local Storage"
+    public static let unableToUseDelegateManager = "Unable to use delegate manager"
+}
+
 enum Events: String {
     case quickBrickReady
     case moveAppToBackground
@@ -45,7 +56,7 @@ enum Events: String {
         case .forceAppReload:
             manager.forceAppReload()
         case .setPrefersHomeIndicatorAutoHidden:
-          manager.setPrefersHomeIndicatorAutoHidden(payload)
+            manager.setPrefersHomeIndicatorAutoHidden(payload)
         }
     }
 }
@@ -123,4 +134,49 @@ class ReactNativeCommunicationModule: NSObject, RCTBridgeModule {
 
         event?.invokeHandler(manager: delegateManager, payload: payload ?? [:])
     }
+
+    @objc func setAppLanguage(_ language: String?,
+                              resolver: @escaping RCTPromiseResolveBlock,
+                              rejecter: @escaping RCTPromiseRejectBlock) {
+        let storageKey = "forcedLanguageCode"
+
+        guard let language = language else {
+            rejecter(ReactNativeCommunicationModuleError.errorCode,
+                     ReactNativeCommunicationModuleError.languageIsUndefined,
+                     nil)
+            return
+        }
+
+        guard !language.isEmpty else {
+            rejecter(ReactNativeCommunicationModuleError.errorCode,
+                     ReactNativeCommunicationModuleError.languageIsEmpty,
+                     nil)
+            return
+        }
+
+        guard let delegateManager = self.delegateManager else {
+            rejecter(ReactNativeCommunicationModuleError.errorCode,
+                     ReactNativeCommunicationModuleError.unableToUseDelegateManager, nil)
+            return
+        }
+
+        DispatchQueue.main.async {
+            guard let storage = FacadeConnector.connector?.storage else {
+                rejecter(ReactNativeCommunicationModuleError.errorCode,
+                         ReactNativeCommunicationModuleError.localStorageNotAccessible, nil)
+                return
+            }
+
+            if storage.localStorageSetValue(for: storageKey,
+                                            value: language,
+                                            namespace: nil) == true {
+                resolver(true)
+            } else {
+                rejecter(ReactNativeCommunicationModuleError.errorCode,
+                         ReactNativeCommunicationModuleError.unableToSaveToLocalStorage, nil)
+            }
+
+            delegateManager.forceAppReload()
+        }
+    }
 }

package/apple/universal/ReactNative/ReactNativeManager.swift

@@ -187,7 +187,7 @@ extension ReactNativeManager: QuickBrickManagerDelegate {
         completion = nil
     }
 
-    /// Force application to move to background
+    /// Force application to move to bakckground
     public func moveAppToBackground() {
         DispatchQueue.main.async {
             UIApplication.shared.perform(NSSelectorFromString(suspendApp))
@@ -226,4 +226,4 @@ extension ReactNativeManager: QuickBrickManagerDelegate {
     public func forceAppReload() {
         EventsBus.post(EventsBus.Event(type: EventsBusType(.forceAppReload)))
     }
-}
+}

package/apple/universal/ReactNative/ReactNativeModulesExports.m

@@ -13,6 +13,9 @@
 RCT_EXTERN_METHOD(quickBrickEvent:(NSString *)eventName
                       payload:(NSDictionary *)payload);
 
+RCT_EXTERN_METHOD(setAppLanguage:(NSString *)language
+                      resolver:(RCTPromiseResolveBlock)resolver
+                          rejecter:(RCTPromiseRejectBlock)rejecter);
 @end
 
 @interface RCT_EXTERN_MODULE (AnalyticsBridge, NSObject)
@@ -123,5 +126,5 @@ RCT_EXTERN_METHOD(delete:(NSString *)path
                           rejecter:(RCTPromiseRejectBlock)reject);
 
 RCT_EXTERN_METHOD(getFilesDirectory:(RCTPromiseResolveBlock)resolve
-                          rejecter:(RCTPromiseRejectBlock)reject);
+                      rejecter:(RCTPromiseRejectBlock)reject);
 @end

package/apple/universal/Storages/LocalStorage/LocalStorageBridge.swift

@@ -10,6 +10,13 @@ import Foundation
 import React
 import ZappCore
 
+public struct LocalErrorCallBack {
+    public static let errorCode = "LocalStorageError"
+    public static let errorMessageSet = "Local values could not be saved"
+    public static let errorMessageGet = "Local values could not be retrieved"
+    public static let errorMessageRemove = "Local values could not be removed"
+}
+
 @objc(LocalStorage)
 class LocalStorageBridge: NSObject, RCTBridgeModule {
     var bridge: RCTBridge!
@@ -22,18 +29,6 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
         return true
     }
 
-    /// prefered thread on which to run this native module
-    @objc public var methodQueue: DispatchQueue {
-        return DispatchQueue.main
-    }
-    
-    struct Errors {
-        static let errorCode = "LocalErrors"
-        static let errorMessageSet = "Local storage value could not be saved"
-        static let errorMessageGet = "Local storage value could not be retrieved"
-        static let errorMessageRemove = "Local storage value could not be removed"
-    }
-
     // MARK: RC extern methods
 
     /// Store a stringified object in LocalStorage
@@ -47,19 +42,21 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
     @objc public func setItem(_ key: String?, value: String?, namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let value = value,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
-            return
-        }
-
-        if storage.localStorageSetValue(for: key,
-                                        value: value,
-                                        namespace: namespace) == true {
-            resolver(true)
-        } else {
-            rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let value = value,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageSet, nil)
+                return
+            }
+
+            if storage.localStorageSetValue(for: key,
+                                            value: value,
+                                            namespace: namespace) == true {
+                resolver(true)
+            } else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageSet, nil)
+            }
         }
     }
 
@@ -74,14 +71,16 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                               namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
-            return
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageGet, nil)
+                return
+            }
+
+            let retVal = storage.localStorageValue(for: key, namespace: namespace)
+            resolver(retVal)
         }
-
-        let retVal = storage.localStorageValue(for: key, namespace: namespace)
-        resolver(retVal)
     }
 
     /// Remove previously saved session value by key
@@ -95,15 +94,17 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                  namespace: String?,
                                  resolver: @escaping RCTPromiseResolveBlock,
                                  rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageRemove, nil)
-            return
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageRemove, nil)
+                return
+            }
+
+            let retVal = storage.localStorageRemoveValue(for: key,
+                                                         namespace: namespace)
+            resolver(retVal)
         }
-
-        let retVal = storage.localStorageRemoveValue(for: key,
-                                                     namespace: namespace)
-        resolver(retVal)
     }
 
     /// Get ALL previously saved session values
@@ -115,13 +116,15 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
     @objc public func getAllItems(_ namespace: String?,
                                   resolver: @escaping RCTPromiseResolveBlock,
                                   rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
-            return
+        DispatchQueue.main.async {
+            guard let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageGet, nil)
+                return
+            }
+
+            let retVal = storage.localStorageAllValues(namespace: namespace)
+            resolver(retVal)
         }
-
-        let retVal = storage.localStorageAllValues(namespace: namespace)
-        resolver(retVal)
     }
 
     /// Store a stringified object in Keychain
@@ -137,19 +140,21 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                       namespace: String?,
                                       resolver: @escaping RCTPromiseResolveBlock,
                                       rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let value = value,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
-            return
-        }
-
-        if storage.keychainStorageSetValue(for: key,
-                                           value: value,
-                                           namespace: namespace) == true {
-            resolver(true)
-        } else {
-            rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let value = value,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageSet, nil)
+                return
+            }
+
+            if storage.keychainStorageSetValue(for: key,
+                                               value: value,
+                                               namespace: namespace) == true {
+                resolver(true)
+            } else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageSet, nil)
+            }
         }
     }
 
@@ -164,14 +169,16 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                       namespace: String?,
                                       resolver: @escaping RCTPromiseResolveBlock,
                                       rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
-            return
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageGet, nil)
+                return
+            }
+
+            let retVal = storage.keychainStorageValue(for: key, namespace: namespace)
+            resolver(retVal)
         }
-
-        let retVal = storage.keychainStorageValue(for: key, namespace: namespace)
-        resolver(retVal)
     }
 
     /// Remove previously saved Keychain value by key
@@ -185,14 +192,16 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                          namespace: String?,
                                          resolver: @escaping RCTPromiseResolveBlock,
                                          rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageRemove, nil)
-            return
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, LocalErrorCallBack.errorMessageRemove, nil)
+                return
+            }
+
+            let retVal = storage.keychainStorageRemoveValue(for: key,
+                                                            namespace: namespace)
+            resolver(retVal)
         }
-
-        let retVal = storage.keychainStorageRemoveValue(for: key,
-                                                        namespace: namespace)
-        resolver(retVal)
     }
 }

package/apple/universal/Storages/SessionStorage/SessionStorageBridge.swift

@@ -10,6 +10,13 @@ import Foundation
 import React
 import ZappCore
 
+public struct StorageErrorCallback {
+    public static let errorCode = "SessionStorageError"
+    public static let errorMessageSet = "Session values could not be saved"
+    public static let errorMessageGet = "Session values could not be retrieved"
+    public static let errorMessageRemove = "Session values could not be removed"
+}
+
 @objc(SessionStorage)
 class SessionStorageBridge: NSObject, RCTBridgeModule {
     var bridge: RCTBridge!
@@ -22,18 +29,6 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
         return true
     }
 
-    /// prefered thread on which to run this native module
-    @objc public var methodQueue: DispatchQueue {
-        return DispatchQueue.main
-    }
-
-    struct Errors {
-        static let errorCode = "SessionErrors"
-        static let errorMessageSet = "Session storage value could not be saved"
-        static let errorMessageGet = "Session storage value could not be retrieved"
-        static let errorMessageRemove = "Session storage value could not be removed"
-    }
-
     // MARK: RC extern methods
 
     /// Store a stringified object in SessionStorage
@@ -47,19 +42,21 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
     @objc public func setItem(_ key: String?, value: String?, namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let value = value,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
-            return
-        }
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let value = value,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(StorageErrorCallback.errorCode, StorageErrorCallback.errorMessageSet, nil)
+                return
+            }
 
-        if storage.sessionStorageSetValue(for: key,
-                                          value: value,
-                                          namespace: namespace) == true {
-            resolver(true)
-        } else {
-            rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
+            if storage.sessionStorageSetValue(for: key,
+                                              value: value,
+                                              namespace: namespace) == true {
+                resolver(true)
+            } else {
+                rejecter(StorageErrorCallback.errorCode, StorageErrorCallback.errorMessageSet, nil)
+            }
         }
     }
 
@@ -73,15 +70,16 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
     @objc public func getItem(_ key: String?, namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
-            return
-        }
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(StorageErrorCallback.errorCode, StorageErrorCallback.errorMessageGet, nil)
+                return
+            }
 
-        let retVal = storage.sessionStorageValue(for: key,
-                                                 namespace: namespace)
-        resolver(retVal)
+            let retVal = storage.sessionStorageValue(for: key, namespace: namespace)
+            resolver(retVal)
+        }
     }
 
     /// Remove previously saved session value by key
@@ -95,15 +93,17 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
                                  namespace: String?,
                                  resolver: @escaping RCTPromiseResolveBlock,
                                  rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageRemove, nil)
-            return
-        }
+        DispatchQueue.main.async {
+            guard let key = key,
+                  let storage = FacadeConnector.connector?.storage else {
+                rejecter(LocalErrorCallBack.errorCode, StorageErrorCallback.errorMessageRemove, nil)
+                return
+            }
 
-        let retVal = storage.sessionStorageRemoveValue(for: key,
-                                                       namespace: namespace)
-        resolver(retVal)
+            let retVal = storage.sessionStorageRemoveValue(for: key,
+                                                           namespace: namespace)
+            resolver(retVal)
+        }
     }
 
     /// Get ALL previously saved session values
@@ -115,11 +115,13 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
     @objc public func getAllItems(_ namespace: String?,
                                   resolver: @escaping RCTPromiseResolveBlock,
                                   rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let storage = FacadeConnector.connector?.storage else {
-            rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
-            return
+        DispatchQueue.main.async {
+            guard let storage = FacadeConnector.connector?.storage else {
+                rejecter(StorageErrorCallback.errorCode, StorageErrorCallback.errorMessageGet, nil)
+                return
+            }
+            let retVal = storage.sessionStorageAllValues(namespace: namespace)
+            resolver(retVal)
         }
-        let retVal = storage.sessionStorageAllValues(namespace: namespace)
-        resolver(retVal)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "5.14.2",
+  "version": "5.15.0-alpha.2",
   "description": "iOS and tvOS native code for QuickBrick applications. This package is used to provide native logic for QuickBrick",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"