Merge pull request #444 from Iterable/feature/mob-2529-persist

[MOB-2529] - Persist previous feature state locally.

Author: tapashmajumder

swift-sdk/Constants.swift

@@ -52,6 +52,8 @@ public enum Const {
         static let ddlChecked = "itbl_ddl_checked"
         static let deviceId = "itbl_device_id"
         static let sdkVersion = "itbl_sdk_version"
+        static let offlineMode = "itbl_offline_mode"
+        static let offlineModeBeta = "itbl_offline_mode_beta"
 
         static let payloadExpiration = 24
         static let attributionInfoExpiration = 24

swift-sdk/Internal/DependencyContainer.swift

@@ -125,7 +125,7 @@ struct DependencyContainer: DependencyContainerProtocol {
         InAppFetcher(apiClient: apiClient)
     }
 
-    let offlineMode = true
+    let offlineMode = false
     let dateProvider: DateProviderProtocol = SystemDateProvider()
     let networkSession: NetworkSessionProtocol = URLSession(configuration: .default)
     let notificationStateProvider: NotificationStateProviderProtocol = SystemNotificationStateProvider()

swift-sdk/Internal/IterableAPIInternal.swift

@@ -663,9 +663,13 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
     private func checkRemoteConfiguration() {
         ITBInfo()
         requestHandler.getRemoteConfiguration().onSuccess { remoteConfiguration in
-            self.requestHandler.offlineMode = remoteConfiguration.offlineModeBeta
+            self.localStorage.offlineMode = remoteConfiguration.offlineMode
+            self.localStorage.offlineModeBeta = remoteConfiguration.offlineModeBeta
+            self.requestHandler.offlineMode = remoteConfiguration.isOfflineModeEnabled()
         }.onError { error in
-            ITBError("Could not get remote configuration: \(error.localizedDescription)")
+            let offlineMode = self.localStorage.isOfflineModeEnabled()
+            ITBError("Could not get remote configuration: \(error.localizedDescription), defaulting to saved: \(offlineMode)")
+            self.requestHandler.offlineMode = offlineMode
         }
     }
 

swift-sdk/Internal/LocalStorageProtocol.swift

@@ -11,8 +11,18 @@ protocol LocalStorageProtocol {
     var ddlChecked: Bool { get set }
     var deviceId: String? { get set }
     var sdkVersion: String? { get set }
+    var offlineMode: Bool { get set }
+    var offlineModeBeta: Bool { get set }
     func getAttributionInfo(currentDate: Date) -> IterableAttributionInfo?
     func save(attributionInfo: IterableAttributionInfo?, withExpiration expiration: Date?)
     func getPayload(currentDate: Date) -> [AnyHashable: Any]?
     func save(payload: [AnyHashable: Any]?, withExpiration: Date?)
 }
+
+extension LocalStorageProtocol {
+
+    func isOfflineModeEnabled() -> Bool {
+        RemoteConfiguration.isBeta ? offlineModeBeta  : offlineMode
+    }
+    
+}

swift-sdk/Internal/Models.swift

@@ -6,6 +6,13 @@
 import Foundation
 
 struct RemoteConfiguration: Codable, Equatable {
+    static let isBeta = true
+    
     let offlineMode: Bool
     let offlineModeBeta: Bool
+    
+    func isOfflineModeEnabled() -> Bool {
+        Self.isBeta ? offlineModeBeta : offlineMode
+    }
+    
 }

swift-sdk/Internal/UserDefaultsLocalStorage.swift

@@ -57,6 +57,23 @@ struct UserDefaultsLocalStorage: LocalStorageProtocol {
         }
     }
 
+    var offlineMode: Bool {
+        get {
+            return bool(withKey: .offlineMode)
+        } set {
+            save(bool: newValue, withKey: .offlineMode)
+        }
+    }
+    
+    var offlineModeBeta: Bool {
+        get {
+            return bool(withKey: .offlineModeBeta)
+        }
+        set {
+            save(bool: newValue, withKey: .offlineModeBeta)
+        }
+    }
+    
     func getAttributionInfo(currentDate: Date) -> IterableAttributionInfo? {
         (try? codable(withKey: .attributionInfo, currentDate: currentDate)) ?? nil
     }
@@ -185,6 +202,8 @@ struct UserDefaultsLocalStorage: LocalStorageProtocol {
         static let ddlChecked = LocalStorageKey(value: Const.UserDefaults.ddlChecked)
         static let deviceId = LocalStorageKey(value: Const.UserDefaults.deviceId)
         static let sdkVersion = LocalStorageKey(value: Const.UserDefaults.sdkVersion)
+        static let offlineMode = LocalStorageKey(value: Const.UserDefaults.offlineMode)
+        static let offlineModeBeta = LocalStorageKey(value: Const.UserDefaults.offlineModeBeta)
     }
 
     private struct Envelope: Codable {

tests/common/CommonMocks.swift

@@ -534,6 +534,10 @@ class MockLocalStorage: LocalStorageProtocol {
 
     var sdkVersion: String? = nil
 
+    var offlineMode: Bool = false
+    
+    var offlineModeBeta: Bool = false
+    
     func getAttributionInfo(currentDate: Date) -> IterableAttributionInfo? {
         guard !MockLocalStorage.isExpired(expiration: attributionInfoExpiration, currentDate: currentDate) else {
             return nil

tests/swift-sdk-swift-tests/foundational-tests/LocalStorageTests.swift

@@ -155,4 +155,39 @@ class LocalStorageTests: XCTestCase {
         localStorage.authToken = nil
         XCTAssertNil(localStorage.authToken)
     }
+    
+    func testOfflineMode() {
+        let saver = { (storage: LocalStorageProtocol, value: Bool) -> Void in
+            var localStorage = storage
+            localStorage.offlineMode = value
+        }
+        let retriever = { (storage: LocalStorageProtocol) -> Bool? in
+            storage.offlineMode
+        }
+        
+        testLocalStorage(saver: saver, retriever: retriever, value: true)
+        testLocalStorage(saver: saver, retriever: retriever, value: false)
+    }
+    
+    func testOfflineModeBeta() {
+        let saver = { (storage: LocalStorageProtocol, value: Bool) -> Void in
+            var localStorage = storage
+            localStorage.offlineModeBeta = value
+        }
+        let retriever = { (storage: LocalStorageProtocol) -> Bool? in
+            storage.offlineModeBeta
+        }
+        
+        testLocalStorage(saver: saver, retriever: retriever, value: true)
+        testLocalStorage(saver: saver, retriever: retriever, value: false)
+    }
+    
+    private func testLocalStorage<T>(saver: (LocalStorageProtocol, T) -> Void,
+                                     retriever: (LocalStorageProtocol) -> T?, value: T) where T: Equatable {
+        let localStorage = UserDefaultsLocalStorage(userDefaults: LocalStorageTests.getTestUserDefaults())
+        saver(localStorage, value)
+        let retrievedLocalStorage = UserDefaultsLocalStorage(userDefaults: LocalStorageTests.getTestUserDefaults())
+        let retrieved = retriever(retrievedLocalStorage)
+        XCTAssertEqual(value, retrieved)
+    }
 }