fix conflicts

Author: jaeopt

OptimizelySDK/Data Model/ProjectConfig.swift

@@ -24,8 +24,7 @@ class ProjectConfig {
     // local runtime forcedVariations [UserId: [ExperimentId: VariationId]]
     // NOTE: experiment.forcedVariations use [ExperimentKey: VariationKey] instead of ids
 
-    private var whitelistUsers = [String: [String: String]]()
-    private var experimentFeatureMap = [String: [String]]()
+    var whitelistUsers = [String: [String: String]]()
 
     init(datafile: Data) throws {
         do {
@@ -36,7 +35,6 @@ class ProjectConfig {
         if !isValidVersion(version: self.project.version) {
             throw OptimizelyError.dataFileVersionInvalid(self.project.version)
         }
-        generateExperimentFeatureMap()
     }
 
     convenience init(datafile: String) throws {
@@ -90,20 +88,6 @@ extension ProjectConfig {
         // old versions (< 4) of datafiles not supported
         return ["4"].contains(version)
     }
-    
-    private func generateExperimentFeatureMap() {
-        for feature in project.featureFlags {
-            for id in feature.experimentIds {
-                if var featureIdArray = experimentFeatureMap[id] {
-                    featureIdArray.append(feature.id)
-                    experimentFeatureMap[id] = featureIdArray
-                }
-                else {
-                    experimentFeatureMap[id] = [feature.id]
-                }
-            }
-        }
-    }
 }
 
 // MARK: - Project Access
@@ -192,7 +176,12 @@ extension ProjectConfig {
      *  Returns true if experiment belongs to any feature, false otherwise.
      */
     func isFeatureExperiment(id: String) -> Bool {
-        return experimentFeatureMap.keys.contains(id)
+        if let _ = project.featureFlags.map({ $0.experimentIds.contains(id)}).first {
+            return true
+        }
+        else {
+            return false
+        }
     }
 
     /**

OptimizelySDK/Extensions/Date+Extension.swift

@@ -19,8 +19,8 @@ import Foundation
 class DefaultDatafileHandler : OPTDatafileHandler {
     static public var endPointStringFormat = "https://cdn.optimizely.com/datafiles/%@.json"
     lazy var logger = HandlerRegistryService.shared.injectLogger()
-    var timers:AtomicProperty<[String:Timer]> = AtomicProperty(property: [String:Timer]())
-    let dataStore = DataStoreUserDefaults()
+    var timers:AtomicProperty<[String:(timer:Timer, interval:Int)]> = AtomicProperty(property: [String:(Timer,Int)]())
+    let dataStore = DataStoreUserDefaults()x
 
     required init() {
 
@@ -92,8 +92,7 @@ class DefaultDatafileHandler : OPTDatafileHandler {
 
                 completionHandler(result)
 
-                self.logger?.d(response.debugDescription)
-                
+                //self.logger?.d(response.debugDescription)                
             }
 
             task.resume()
@@ -106,7 +105,7 @@ class DefaultDatafileHandler : OPTDatafileHandler {
         let now = Date()
         if #available(iOS 10.0, tvOS 10.0, *) {
             DispatchQueue.main.async {
-                if let timer = self.timers.property?[sdkKey], timer.isValid {
+                if let timer = self.timers.property?[sdkKey]?.timer, timer.isValid {
                     return
                 }
 
@@ -120,20 +119,30 @@ class DefaultDatafileHandler : OPTDatafileHandler {
                     timer.invalidate()
                 }
                 self.timers.performAtomic(atomicOperation: { (timers) in
-                    timers[sdkKey] = timer
+                    if let interval = timers[sdkKey]?.interval {
+                        timers[sdkKey] = (timer,interval)
+                    }
+                    else {
+                        timers[sdkKey] = (timer,updateInterval)
+                    }
                 })
             }
         } else {
             // Fallback on earlier versions
             DispatchQueue.main.async {
-                if let timer = self.timers.property?[sdkKey], timer.isValid {
+                if let timer = self.timers.property?[sdkKey]?.timer, timer.isValid {
                     return
                 }
 
-                let timer = Timer.scheduledTimer(timeInterval: TimeInterval(updateInterval), target: self, selector:#selector(self.timerFired(timer:)), userInfo: ["sdkKey": sdkKey, "startTime": Date(), "updateInterval":updateInterval, "datafileChangeNotification":datafileChangeNotification ?? { (data) in }], repeats: false)
+                let timer = Timer.scheduledTimer(timeInterval: TimeInterval(updateInterval), target: self, selector:#selector(self.timerFired(timer:)), userInfo: ["sdkKey": sdkKey, "startTime": Date(), "updateInterval":  updateInterval, "datafileChangeNotification":datafileChangeNotification ?? { (data) in }], repeats: false)
 
                 self.timers.performAtomic(atomicOperation: { (timers) in
-                    timers[sdkKey] = timer
+                    if let interval = timers[sdkKey]?.interval {
+                        timers[sdkKey] = (timer,interval)
+                    }
+                    else {
+                        timers[sdkKey] = (timer,updateInterval)
+                    }
                 })
             }
 
@@ -145,7 +154,7 @@ class DefaultDatafileHandler : OPTDatafileHandler {
         if let info = timer.userInfo as? [String:Any],
             let sdkKey = info["sdkKey"] as? String,
             let updateInterval = info["updateInterval"] as? Int,
-            let startDate = info["startDate"] as? Date,
+            let startDate = info["startTime"] as? Date,
             let datafileChangeNotification = info["datafileChangeNotification"] as? ((Data)->Void){
             self.performPerodicDownload(sdkKey: sdkKey, startTime: startDate, updateInterval: updateInterval, datafileChangeNotification: datafileChangeNotification)
         }
@@ -180,12 +189,15 @@ class DefaultDatafileHandler : OPTDatafileHandler {
             }
 
             if self.hasPeriodUpdates(sdkKey: sdkKey) {
-                let minutesSinceFire = startTime.minutesPastSinceNow()
-                var diff = updateInterval - minutesSinceFire
-                if diff < 0 {
-                    diff = 0
+                let interval = self.timers.property?[sdkKey]?.interval ?? updateInterval
+                let actualDiff = (Int(abs(startTime.timeIntervalSinceNow)) - updateInterval)
+                var nextInterval = interval
+                if actualDiff > 0 {
+                    nextInterval -= actualDiff
                 }
-                self.startPeriodicUpdates(sdkKey: sdkKey, updateInterval: diff, datafileChangeNotification: datafileChangeNotification)
+                
+                self.logger?.d("next datafile download is \(nextInterval) seconds \(Date())")
+                self.startPeriodicUpdates(sdkKey: sdkKey, updateInterval: nextInterval, datafileChangeNotification: datafileChangeNotification)
             }
         }
     }
@@ -195,19 +207,17 @@ class DefaultDatafileHandler : OPTDatafileHandler {
             if let timer = timers[sdkKey] {
                 logger?.i("Stopping timer for datafile updates sdkKey: \(sdkKey)")
 
-                timer.invalidate()
+                timer.timer.invalidate()
                 timers.removeValue(forKey: sdkKey)
             }
 
         }
     }
 
     func stopPeriodicUpdates() {
-        timers.performAtomic { (timers) in
-            for key in timers.keys {
-                logger?.i("Stopping timer for all datafile updates")
-                stopPeriodicUpdates(sdkKey: key)
-            }
+        for key in timers.property?.keys ?? Dictionary<String, (timer: Timer, interval: Int)>().keys {
+            logger?.i("Stopping timer for all datafile updates")
+            stopPeriodicUpdates(sdkKey: key)
         }
 
     }

OptimizelySDK/Implementation/DefaultDatafileHandler.swift

@@ -157,8 +157,11 @@ open class OptimizelyManager: NSObject {
                     // new datafile came in...
                     self.reInitLock.wait(); defer { self.reInitLock.signal() }
                     if let config = try? ProjectConfig(datafile: data) {
-                        
                         do {
+                            if let users = self.config?.whitelistUsers {
+                                config.whitelistUsers = users
+                            }
+                            
                             self.config = config
 
                             // call reinit on the services we know we are reinitializing.