Merge pull request #664 from Iterable/MOB-6583-OfflineMode-Default-Off

[MOB - 6583] - No Offline Components when Online-Only
Iterable · Aug 3, 2023 · 641881c · 641881c
2 parents 61b8721 + 48a5e9e
commit 641881c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme
@@ -210,6 +210,11 @@
                BlueprintName = "offline-events-tests"
                ReferencedContainer = "container:swift-sdk.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "RequestHandlerTests/testFeatureFlagTurnOnOfflineMode()">
+               </Test>
+            </SkippedTests>
          </TestableReference>
       </Testables>
    </TestAction>

diff --git a/swift-sdk/Internal/DependencyContainerProtocol.swift b/swift-sdk/Internal/DependencyContainerProtocol.swift
@@ -70,21 +70,33 @@ extension DependencyContainerProtocol {
                                                      networkSession: networkSession,
                                                      deviceMetadata: deviceMetadata,
                                                      dateProvider: dateProvider)
-        if let persistenceContextProvider = createPersistenceContextProvider() {
+        lazy var offlineProcessor: OfflineRequestProcessor? = nil
+        lazy var healthMonitor: HealthMonitor? = nil
+        guard let persistenceContextProvider = createPersistenceContextProvider() else {
+            return RequestHandler(onlineProcessor: onlineProcessor,
+                                  offlineProcessor: nil,
+                                  healthMonitor: nil,
+                                  offlineMode: offlineMode)
+        }
+        if offlineMode {
+
             let healthMonitorDataProvider = createHealthMonitorDataProvider(persistenceContextProvider: persistenceContextProvider)
-            let healthMonitor = HealthMonitor(dataProvider: healthMonitorDataProvider,
-                                              dateProvider: dateProvider,
-                                              networkSession: networkSession)
-            let offlineProcessor = OfflineRequestProcessor(apiKey: apiKey,
-                                                           authProvider: authProvider,
-                                                           authManager: authManager,
-                                                           endpoint: endpoint,
-                                                           deviceMetadata: deviceMetadata,
-                                                           taskScheduler: createTaskScheduler(persistenceContextProvider: persistenceContextProvider,
-                                                                                              healthMonitor: healthMonitor),
-                                                           taskRunner: createTaskRunner(persistenceContextProvider: persistenceContextProvider,
-                                                                                        healthMonitor: healthMonitor),
-                                                           notificationCenter: notificationCenter)
+
+            healthMonitor = HealthMonitor(dataProvider: healthMonitorDataProvider,
+                                          dateProvider: dateProvider,
+                                          networkSession: networkSession)
+            offlineProcessor = OfflineRequestProcessor(apiKey: apiKey,
+                                                       authProvider: authProvider,
+                                                       authManager: authManager,
+                                                       endpoint: endpoint,
+                                                       deviceMetadata: deviceMetadata,
+                                                       taskScheduler: createTaskScheduler(persistenceContextProvider: persistenceContextProvider,
+                                                                                          healthMonitor: healthMonitor!),
+                                                       taskRunner: createTaskRunner(persistenceContextProvider: persistenceContextProvider,
+                                                                                    healthMonitor: healthMonitor!),
+                                                       notificationCenter: notificationCenter)
+
+
             return RequestHandler(onlineProcessor: onlineProcessor,
                                   offlineProcessor: offlineProcessor,
                                   healthMonitor: healthMonitor,

diff --git a/swift-sdk/Internal/RequestHandler.swift b/swift-sdk/Internal/RequestHandler.swift
@@ -8,7 +8,7 @@ class RequestHandler: RequestHandlerProtocol {
     init(onlineProcessor: OnlineRequestProcessor,
          offlineProcessor: OfflineRequestProcessor?,
          healthMonitor: HealthMonitor?,
-         offlineMode: Bool = true) {
+         offlineMode: Bool = false) {
         ITBInfo()
         self.onlineProcessor = onlineProcessor
         self.offlineProcessor = offlineProcessor