Prepare 4.7.0 release

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to the LaunchDarkly iOS SDK will be documented in this file.
 ### Multiple Environment clients
 Version 4.0.0 does not support multiple environments. If you use version `2.14.0` or later and set `LDConfig`'s `secondaryMobileKeys` you will not be able to migrate to version `4.0.0`. Multiple Environments will be added in a future release to the Swift SDK.
 
+## [4.7.0] - 2020-06-03
+### Added
+- Added a new method signature for `startCompleteWhenFlagsReceived` that accepts an additional argument specifying a maximum time to wait for flags to be received before calling the completion closure. The completion closure on this method will be passed a `Bool` on completion indication whether the operation timed out.
 
 ## [4.6.0] - 2020-05-26
 ### Added

LaunchDarkly.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |ld|
 
   ld.name         = "LaunchDarkly"
-  ld.version      = "4.6.0"
+  ld.version      = "4.7.0"
   ld.summary      = "iOS SDK for LaunchDarkly"
 
   ld.description  = <<-DESC
@@ -25,7 +25,7 @@ Pod::Spec.new do |ld|
   ld.tvos.deployment_target    = "9.0"
   ld.osx.deployment_target     = "10.10"
 
-  ld.source       = { :git => "https://github.com/launchdarkly/ios-client-sdk.git", :tag => '4.6.0'}
+  ld.source       = { :git => "https://github.com/launchdarkly/ios-client-sdk.git", :tag => '4.7.0'}
 
   ld.source_files = "LaunchDarkly/LaunchDarkly/**/*.{h,m,swift}"
 

LaunchDarkly/LaunchDarkly/LDClient.swift

@@ -361,7 +361,44 @@ public class LDClient {
             completion?()
         }
     }
+
+    /**
+     See [start](x-source-tag://start) for more information on starting the SDK.
+
+     This method listens for flag updates so the completion will only return once an update has occurred. If the SDK is configured to start offline the method will ignore the timeout and call the completion with True without awaiting a flag update.
+
+     - parameter config: The LDConfig that contains the desired configuration. (Required)
+     - parameter user: The LDUser set with the desired user. If omitted, LDClient retains the previously set user, or default if one was never set. (Optional)
+     - parameter startWaitSeconds: A TimeInterval representing how long to wait for flags before returning true in the completion to indicate that it timed out.
+     - parameter completion: Closure called when the embedded `setOnlineIdentify` call completes, subject to throttling delays. Takes a Bool as a parameter that indicates whether the SDK did not come online within startWaitSeconds. (Optional)
+     */
+    public func startCompleteWhenFlagsReceived(config: LDConfig, user: LDUser? = nil, startWaitSeconds: TimeInterval, completion: ((_ timedOut: Bool) -> Void)? = nil) {
+        if !config.startOnline {
+            startCompleteWhenFlagsReceived(config: config, user: user)
+            completion?(timeOutCheck)
+        } else {
+            let startTime = Date().timeIntervalSince1970
+            startCompleteWhenFlagsReceived(config: config, user: user) {
+                if startTime + startWaitSeconds > Date().timeIntervalSince1970 {
+                    self.internalTimeOutCheckQueue.sync {
+                        self.timeOutCheck = false
+                        completion?(self.timeOutCheck)
+                    }
+                }
+            }
+            DispatchQueue.global().asyncAfter(deadline: .now() + startWaitSeconds) {
+                self.internalTimeOutCheckQueue.sync {
+                    if self.timeOutCheck {
+                        completion?(self.timeOutCheck)
+                    }
+                }
+            }
+        }
+    }
 
+    private var timeOutCheck = true
+    private let internalTimeOutCheckQueue: DispatchQueue = DispatchQueue(label: "TimeOutQueue")
+
     private func convertCachedData(skipDuringStart skip: Bool) {
         guard !skip
         else {
@@ -1009,7 +1046,7 @@ public class LDClient {
     private(set) var flagCache: FeatureFlagCaching
     private(set) var cacheConverter: CacheConverting
     private(set) var flagSynchronizer: LDFlagSynchronizing
-    private(set) var flagChangeNotifier: FlagChangeNotifying
+    var flagChangeNotifier: FlagChangeNotifying
     private(set) var eventReporter: EventReporting
     private(set) var environmentReporter: EnvironmentReporting
     private(set) var throttler: Throttling

LaunchDarkly/LaunchDarkly/ObjectiveC/ObjcLDClient.swift

@@ -180,6 +180,20 @@ public final class ObjcLDClient: NSObject {
     @objc public func startCompleteWhenFlagsReceived(config configWrapper: ObjcLDConfig, user userWrapper: ObjcLDUser? = nil, completion: (() -> Void)? = nil) {
         LDClient.shared.startCompleteWhenFlagsReceived(config: configWrapper.config, user: userWrapper?.user, completion: completion)
     }
+
+    /**
+     See [start](x-source-tag://start) for more information on starting the SDK.
+
+     This method listens for flag updates so the completion will only return once an update has occurred. If the SDK is configured to start offline the method will ignore the timeout and call the completion with True without awaiting a flag update.
+
+     - parameter configWrapper: The LDConfig that contains the desired configuration. (Required)
+     - parameter userWrapper: The LDUser set with the desired user. If omitted, LDClient retains the previously set user, or default if one was never set. (Optional)
+     - parameter startWaitSeconds: A TimeInterval representing how long to wait for flags before returning true in the completion to indicate that it timed out.
+     - parameter completion: Closure called when the embedded `setOnlineIdentify` call completes, subject to throttling delays. Takes a Bool as a parameter that indicates whether the SDK did not come online within startWaitSeconds. (Optional)
+     */
+    @objc public func startCompleteWhenFlagsReceived(config configWrapper: ObjcLDConfig, user userWrapper: ObjcLDUser? = nil, startWaitSeconds: TimeInterval, completion: ((_ timedOut: Bool) -> Void)? = nil) {
+        LDClient.shared.startCompleteWhenFlagsReceived(config: configWrapper.config, user: userWrapper?.user, startWaitSeconds: startWaitSeconds, completion: completion)
+    }
 
     /**
      Stops the LDClient. Stopping the client means the LDClient goes offline and stops recording events. LDClient will no longer provide feature flag values, only returning fallback values.