Lower level cache

Example/FlagsmithClient/AppDelegate.swift

@@ -25,16 +25,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                                      Flag(featureName: "my_name", stringValue:"Testing", enabled: true)]
 
     // set cache on / off (defaults to off)
-    Flagsmith.shared.useCache = true
+    Flagsmith.shared.cacheConfig.useCache = true
 
     // set custom cache to use (defaults to shared URLCache)
-    //Flagsmith.shared.cache = <CUSTOM_CACHE>
+    //Flagsmith.shared.cacheConfig.cache = <CUSTOM_CACHE>
 
     // set skip API on / off (defaults to off)
-    Flagsmith.shared.skipAPI = false
+    Flagsmith.shared.cacheConfig.skipAPI = false
 
     // set cache TTL in seconds (defaults to 0, i.e. infinite)
-    Flagsmith.shared.cacheTTL = 90
+    Flagsmith.shared.cacheConfig.cacheTTL = 90
 
     // set analytics on or off
     Flagsmith.shared.enableAnalytics = true

FlagsmithClient/Classes/Flagsmith.swift

@@ -48,18 +48,9 @@ public class Flagsmith {
 
   /// Default flags to fall back on if an API call fails
   public var defaultFlags: [Flag] = []
-
-  /// Cache to use when enabled, defaults to the shared app cache
-  public var cache: URLCache = URLCache.shared
-
-  /// Use cached flags as a fallback?
-  public var useCache: Bool = false
-
-  /// TTL for the cache in seconds, default of 0 means infinite
-  public var cacheTTL: Double = 0
-
-  /// Skip API if there is a cache available
-  public var skipAPI: Bool = false
+
+  /// Configuration class for the cache settings
+  public var cacheConfig:CacheConfig = CacheConfig()
 
   private init() {
   }
@@ -289,3 +280,19 @@ public class Flagsmith {
     return returnFlags
   }
 }
+
+public class CacheConfig {
+
+  /// Cache to use when enabled, defaults to the shared app cache
+  public var cache: URLCache = URLCache.shared
+
+  /// Use cached flags as a fallback?
+  public var useCache: Bool = false
+
+  /// TTL for the cache in seconds, default of 0 means infinite
+  public var cacheTTL: Double = 0
+
+  /// Skip API if there is a cache available
+  public var skipAPI: Bool = false
+
+}

FlagsmithClient/Classes/Internal/APIManager.swift

@@ -49,8 +49,8 @@ class APIManager : NSObject, URLSessionDataDelegate {
   func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, willCacheResponse proposedResponse: CachedURLResponse, completionHandler: @escaping (CachedURLResponse?) -> Void) {
 
     // intercept and modify the cache settings for the response
-    if Flagsmith.shared.useCache {
-      let newResponse = proposedResponse.response(withExpirationDuration: Int(Flagsmith.shared.cacheTTL))
+    if Flagsmith.shared.cacheConfig.useCache {
+      let newResponse = proposedResponse.response(withExpirationDuration: Int(Flagsmith.shared.cacheConfig.cacheTTL))
       completionHandler(newResponse)
     } else {
       completionHandler(proposedResponse)
@@ -89,10 +89,10 @@ class APIManager : NSObject, URLSessionDataDelegate {
 
     // set the cache policy based on Flagsmith settings
     request.cachePolicy = .reloadIgnoringLocalAndRemoteCacheData
-    session.configuration.urlCache = Flagsmith.shared.cache
-    if Flagsmith.shared.useCache {
+    session.configuration.urlCache = Flagsmith.shared.cacheConfig.cache
+    if Flagsmith.shared.cacheConfig.useCache {
       request.cachePolicy = .useProtocolCachePolicy
-      if Flagsmith.shared.skipAPI {
+      if Flagsmith.shared.cacheConfig.skipAPI {
         request.cachePolicy = .returnCacheDataElseLoad
       }
     }