No need to lazy initialize OfflineRequestProcessor.

Author: tapashmajumder

swift-sdk/Internal/DependencyContainer.swift

@@ -62,29 +62,27 @@ extension DependencyContainerProtocol {
                               authManager: IterableInternalAuthManagerProtocol,
                               deviceMetadata: DeviceMetadata) -> RequestHandlerProtocol {
         if #available(iOS 10.0, *) {
-            return RequestHandler(onlineCreator: { [weak authProvider] in
-                                    OnlineRequestProcessor(apiKey: apiKey,
+            let onlineProcessor = OnlineRequestProcessor(apiKey: apiKey,
+                                                         authProvider: authProvider,
+                                                         authManager: authManager,
+                                                         endPoint: endPoint,
+                                                         networkSession: networkSession,
+                                                         deviceMetadata: deviceMetadata,
+                                                         dateProvider: dateProvider)
+            let offlineProcessor: OfflineRequestProcessor?
+            if let persistenceContextProvider = createPersistenceContextProvider() {
+                offlineProcessor = OfflineRequestProcessor(apiKey: apiKey,
                                                            authProvider: authProvider,
                                                            authManager: authManager,
                                                            endPoint: endPoint,
-                                                           networkSession: networkSession,
                                                            deviceMetadata: deviceMetadata,
-                                                           dateProvider: dateProvider) },
-                                  offlineCreator: { [weak authProvider] in
-                                    guard let persistenceContextProvider = createPersistenceContextProvider() else {
-                                        return nil
-                                    }
-                                    
-                                    return OfflineRequestProcessor(apiKey: apiKey,
-                                                                   authProvider: authProvider,
-                                                                   authManager: authManager,
-                                                                   endPoint: endPoint,
-                                                                   deviceMetadata: deviceMetadata,
-                                                                   taskScheduler: createTaskScheduler(persistenceContextProvider: persistenceContextProvider),
-                                                                   taskRunner: createTaskRunner(persistenceContextProvider: persistenceContextProvider),
-                                                                   notificationCenter: notificationCenter)
-                                  },
-                                  offlineMode: offlineMode)
+                                                           taskScheduler: createTaskScheduler(persistenceContextProvider: persistenceContextProvider),
+                                                           taskRunner: createTaskRunner(persistenceContextProvider: persistenceContextProvider),
+                                                           notificationCenter: notificationCenter)
+            } else {
+                offlineProcessor = nil
+            }
+            return RequestHandler(onlineProcessor: onlineProcessor, offlineProcessor: offlineProcessor)
         } else {
             return LegacyRequestHandler(apiKey: apiKey,
                                         authProvider: authProvider,

swift-sdk/Internal/IterableAPIInternal.swift

@@ -666,6 +666,7 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
             self.localStorage.offlineMode = remoteConfiguration.offlineMode
             self.localStorage.offlineModeBeta = remoteConfiguration.offlineModeBeta
             self.requestHandler.offlineMode = remoteConfiguration.isOfflineModeEnabled()
+            ITBInfo("setting offlineMode: \(self.requestHandler.offlineMode)")
         }.onError { error in
             let offlineMode = self.localStorage.isOfflineModeEnabled()
             ITBError("Could not get remote configuration: \(error.localizedDescription), defaulting to saved: \(offlineMode)")

swift-sdk/Internal/RequestHandler.swift

@@ -6,12 +6,12 @@ import Foundation
 
 @available(iOS 10.0, *)
 class RequestHandler: RequestHandlerProtocol {
-    init(onlineCreator: @escaping () -> OnlineRequestProcessor,
-         offlineCreator: @escaping () -> OfflineRequestProcessor?,
+    init(onlineProcessor: OnlineRequestProcessor,
+         offlineProcessor: OfflineRequestProcessor?,
          offlineMode: Bool = true) {
         ITBInfo()
-        self.onlineCreator = onlineCreator
-        self.offlineCreator = offlineCreator
+        self.onlineProcessor = onlineProcessor
+        self.offlineProcessor = offlineProcessor
         self.offlineMode = offlineMode
     }
 
@@ -251,16 +251,8 @@ class RequestHandler: RequestHandlerProtocol {
         }
     }
 
-    private let onlineCreator: () -> OnlineRequestProcessor
-    private let offlineCreator: () -> OfflineRequestProcessor?
-    
-    private lazy var offlineProcessor: OfflineRequestProcessor? = {
-        offlineCreator()
-    }()
-    
-    private lazy var onlineProcessor: OnlineRequestProcessor = {
-        onlineCreator()
-    }()
+    private let offlineProcessor: OfflineRequestProcessor?
+    private let onlineProcessor: OnlineRequestProcessor
 
     private func chooseRequestProcessor() -> RequestProcessorProtocol {
         if offlineMode {

tests/offline-events-tests/RequestHandlerTests.swift

@@ -833,23 +833,23 @@ class RequestHandlerTests: XCTestCase {
                                             timeInterval: 0.5,
                                             dateProvider: dateProvider)
 
-        return RequestHandler(onlineCreator: {
-                                OnlineRequestProcessor(apiKey: "zee-api-key",
+        let onlineProcessor = OnlineRequestProcessor(apiKey: "zee-api-key",
+                                                     authProvider: self,
+                                                     authManager: nil,
+                                                     endPoint: Endpoint.api,
+                                                     networkSession: networkSession,
+                                                     deviceMetadata: Self.deviceMetadata,
+                                                     dateProvider: self.dateProvider)
+        let offlineProcessor = OfflineRequestProcessor(apiKey: "zee-api-key",
                                                        authProvider: self,
                                                        authManager: nil,
                                                        endPoint: Endpoint.api,
-                                                       networkSession: networkSession,
                                                        deviceMetadata: Self.deviceMetadata,
-                                                       dateProvider: self.dateProvider) },
-                              offlineCreator: {
-                                OfflineRequestProcessor(apiKey: "zee-api-key",
-                                                        authProvider: self,
-                                                        authManager: nil,
-                                                        endPoint: Endpoint.api,
-                                                        deviceMetadata: Self.deviceMetadata,
-                                                        taskScheduler: taskScheduler,
-                                                        taskRunner: taskRunner,
-                                                        notificationCenter: notificationCenter) },
+                                                       taskScheduler: taskScheduler,
+                                                       taskRunner: taskRunner,
+                                                       notificationCenter: notificationCenter)
+        return RequestHandler(onlineProcessor: onlineProcessor,
+                              offlineProcessor: offlineProcessor,
                               offlineMode: selectOffline)
     }