Merge branch 'hotfix/2.6.2'

ssathy2 · ssathy2 · commit 932db331fe9c · 2021-08-18T10:12:50.000-05:00
diff --git a/Examples/GroceryExpress/AppDelegate.swift b/Examples/GroceryExpress/AppDelegate.swift
@@ -19,11 +19,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private let connectionRedirectHandler = ConnectionRedirectHandler(redirectURL: AppDelegate.connectionRedirectURL)
     
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        
         ConnectButtonController.synchronizationLoggingEnabled = true
         ConnectButtonController.analyticsEnabled = true
         ConnectButtonController.initialize(options: .init(enableSDKBackgroundProcess: true, showPermissionsPrompts: true))
-        ConnectButtonController.activate(connections: [DisplayInformation.locationConnection.connectionId])
+        if ConnectionCredentials(settings: .init()).isLoggedIn {
+            ConnectButtonController.activate(connections: [DisplayInformation.locationConnection.connectionId])
+        } else {
+            ConnectButtonController.deactivate()
+        }
         ConnectButtonController.setBackgroundProcessClosures {
             print("Background process started!")
         } expirationHandler: {
diff --git a/Examples/GroceryExpress/ConnectionCredentials.swift b/Examples/GroceryExpress/ConnectionCredentials.swift
@@ -58,12 +58,17 @@ class ConnectionCredentials: ConnectionCredentialProvider, CustomStringConvertib
             Keys.token : token
         ]
         UserDefaults.standard.set(user, forKey: Keys.user)
+        ConnectButtonController.activate(
+            connections: [DisplayInformation.locationConnection.connectionId],
+            lifecycleSynchronizationOptions: .all
+        )
     }
     
     /// Clears the active IFTTT session
     func logout() {
         userToken = nil
         UserDefaults.standard.set(nil, forKey: Keys.user)
+        ConnectButtonController.deactivate()
     }
     
     /// Creates an instance of ConnectionCredentials
diff --git a/Examples/GroceryExpress/SettingsViewController.swift b/Examples/GroceryExpress/SettingsViewController.swift
@@ -60,7 +60,6 @@ class SettingsViewController: UIViewController {
     }
     @IBAction func logoutTapped(_ sender: Any) {
         ConnectionCredentials(settings: settings).logout()
-        ConnectButtonController.deactivate()
         update()
     }
     
diff --git a/IFTTT SDK.xcodeproj/project.pbxproj b/IFTTT SDK.xcodeproj/project.pbxproj
@@ -58,6 +58,7 @@
 		DE1F036D26A8A29800B6CF1A /* SignInWithAppleAuthentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE1F036C26A8A29800B6CF1A /* SignInWithAppleAuthentication.swift */; };
 		DE1F037226A8AD2600B6CF1A /* AuthenticationSessionPresentationContextProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE1F037126A8AD2600B6CF1A /* AuthenticationSessionPresentationContextProvider.swift */; };
 		DE25265623D8C49D0019C9CB /* Analytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE25265523D8C49D0019C9CB /* Analytics.swift */; };
+		DE260F6B26CAFC20004191D1 /* SynchronizationSchedulerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE260F6A26CAFC20004191D1 /* SynchronizationSchedulerTests.swift */; };
 		DE2906D3242BF66E00CC2825 /* Connection+Parsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2906D2242BF66E00CC2825 /* Connection+Parsing.swift */; };
 		DE2F524A2429404200EF986A /* Connection+Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2F52492429404200EF986A /* Connection+Location.swift */; };
 		DE2F524C242940AD00EF986A /* CLCircularRegion+Parsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE2F524B242940AD00EF986A /* CLCircularRegion+Parsing.swift */; };
@@ -234,6 +235,7 @@
 		DE1F036C26A8A29800B6CF1A /* SignInWithAppleAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInWithAppleAuthentication.swift; sourceTree = "<group>"; };
 		DE1F037126A8AD2600B6CF1A /* AuthenticationSessionPresentationContextProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationSessionPresentationContextProvider.swift; sourceTree = "<group>"; };
 		DE25265523D8C49D0019C9CB /* Analytics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Analytics.swift; sourceTree = "<group>"; };
+		DE260F6A26CAFC20004191D1 /* SynchronizationSchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SynchronizationSchedulerTests.swift; sourceTree = "<group>"; };
 		DE2906D2242BF66E00CC2825 /* Connection+Parsing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Connection+Parsing.swift"; sourceTree = "<group>"; };
 		DE2F52492429404200EF986A /* Connection+Location.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Connection+Location.swift"; sourceTree = "<group>"; };
 		DE2F524B242940AD00EF986A /* CLCircularRegion+Parsing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CLCircularRegion+Parsing.swift"; sourceTree = "<group>"; };
@@ -460,6 +462,7 @@
 				DEC29DE525840DE300BF56EE /* LocationServiceTests.swift */,
 				DEC29EE7258419FC00BF56EE /* Info.plist */,
 				DEF4A4962587BA1A00735E98 /* ArrayHelpersTests.swift */,
+				DE260F6A26CAFC20004191D1 /* SynchronizationSchedulerTests.swift */,
 			);
 			path = SDKHostAppTests;
 			sourceTree = "<group>";
@@ -884,6 +887,7 @@
 				DEC29F0125841A0800BF56EE /* String_EmailDataDetectorTests.swift in Sources */,
 				DEC29F0525841A0800BF56EE /* RegionsMonitorTests.swift in Sources */,
 				DEC29F0625841A0800BF56EE /* Connection_ParsingTests.swift in Sources */,
+				DE260F6B26CAFC20004191D1 /* SynchronizationSchedulerTests.swift in Sources */,
 				DEF4A4972587BA1A00735E98 /* ArrayHelpersTests.swift in Sources */,
 				DEC29F0225841A0800BF56EE /* EventPublisherTests.swift in Sources */,
 			);
diff --git a/IFTTT SDK/ConnectButtonController+Public.swift b/IFTTT SDK/ConnectButtonController+Public.swift
@@ -70,25 +70,24 @@ extension ConnectButtonController {
         }
     }
     
-    /// Performs setup of the SDK. Starts the synchronization of in the SDK. Registers background process with the system if desired.
+    /// Performs setup of the SDK.Activated synchronization 
     ///
     /// - Parameters:
     ///     - credentials: An optional object conforming to `ConnectionCredentialProvider` which is used to setup the SDK. If this is nil, the SDK will attempt to use cached values.
-    ///     - lifecycleSynchronizationOptions: An instance of `ApplicationLifecycleSynchronizationOptions` that defines which app lifecycle events the synchronization should occur on. If this parameter is not set, a default value of `ApplicationLifecycleSynchronizationOptions.all` will be used.
-    public static func setup(with credentials: ConnectionCredentialProvider?,
-                             lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions = .all) {
+    public static func setup(with credentials: ConnectionCredentialProvider?) {
         if let credentials = credentials {
             Keychain.update(with: credentials)
         }
-        ConnectionsSynchronizer.shared.setup(lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)
     }
     
     /// Call this method to activate the synchronization. This starts synchronization for the parameter connections.
     ///
     /// - Parameters:
     ///     - connections: An optional list of `Connection` to activate synchronization with.
-    public static func activate(connections ids: [String]? = nil) {
-        ConnectionsSynchronizer.shared.activate(connections: ids)
+    ///     - lifecycleSynchronizationOptions: An instance of `ApplicationLifecycleSynchronizationOptions` that defines which app lifecycle events the synchronization should occur on. If this parameter is not set, a default value of `ApplicationLifecycleSynchronizationOptions.all` will be used.
+    public static func activate(connections ids: [String]? = nil,
+                                lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions = .all) {
+        ConnectionsSynchronizer.shared.activate(connections: ids, lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)
     }
     
     /// Call this method to deactivate the synchronization of connection and native service data. This stops synchronization and performs cleanup of any stored data. This will also remove any registered geofences.
diff --git a/IFTTT SDK/ConnectionsSynchronizer.swift b/IFTTT SDK/ConnectionsSynchronizer.swift
@@ -133,14 +133,6 @@ final class ConnectionsSynchronizer {
         location.start()
     }
     
-    /// Performs basic setup of the SDK with Application lifecycle synchronization options.
-    ///
-    /// - Parameters:
-    ///     - lifecycleSynchronizationOptions: The synchronization options to use in setting up App Lifecycle notification observers.
-    func setup(lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions) {
-        scheduler.setup(lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)
-    }
-    
     /// Can be used to force a synchronization.
     ///
     /// - Parameters:
@@ -151,19 +143,20 @@ final class ConnectionsSynchronizer {
         eventPublisher.onNext(event)
     }
     
-    /// Used to start the synchronization with an optional list of connection ids to monitor.
+    /// Used to start the synchronization.
     ///
     /// - Parameters:
     ///     - connections: An optional list of connections to start monitoring.
-    func activate(connections ids: [String]? = nil) {
+    ///     - lifecycleSynchronizationOptions: The app lifecycle synchronization options to use with the scheduler
+    func activate(connections ids: [String]? = nil, lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions) {
+        start(lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)
+        update(isActivation: true)
         if let ids = ids {
             registry.addConnections(with: ids, shouldNotify: false)
             ConnectButtonController.synchronizationLog("Activated synchronization with connection ids: \(ids)")
         } else {
             ConnectButtonController.synchronizationLog("Activated synchronization")
         }
-        start()
-        update(isActivation: true)
     }
     
     /// Used to deactivate and stop synchronization.
@@ -174,19 +167,17 @@ final class ConnectionsSynchronizer {
     }
     
     /// Call this to start the synchronization. Safe to be called multiple times.
-    private func start() {
+    private func start(lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions) {
         if state == .running { return }
         
-        setupNotifications()
         performPreflightChecks()
         Keychain.resetIfNecessary(force: false)
-        scheduler.start()
+        scheduler.start(lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)
         state = .running
     }
     
     /// Call this to stop the synchronization completely. Safe to be called multiple times.
     private func stop() {
-        stopNotifications()
         Keychain.resetIfNecessary(force: true)
         scheduler.stop()
         state = .stopped
@@ -198,22 +189,7 @@ final class ConnectionsSynchronizer {
             ConnectButtonController.synchronizationLog("Background location not enabled for this target! Enable background location to allow location updates to be delivered to the app in the background.")
         }
     }
-    
-    /// Peforms internal setup to allow the SDK to perform work in response to notification center notifications.
-    private func setupNotifications() {
-        if #available(iOS 13.0, *) {
-            NotificationCenter.default.addObserver(self,
-                                                   selector: #selector(applicationDidEnterBackground),
-                                                   name: UIApplication.didEnterBackgroundNotification,
-                                                   object: nil)
-        }
-    }
-    
-    /// Stops notification observation
-    private func stopNotifications() {
-        NotificationCenter.default.removeObserver(self)
-    }
-    
+        
     private func setupRegistryNotifications() {
         NotificationCenter.default.addObserver(forName: .UpdateConnectionsName,
                                                object: nil,
diff --git a/IFTTT SDK/SynchronizationManager.swift b/IFTTT SDK/SynchronizationManager.swift
@@ -36,7 +36,7 @@ final class SynchronizationManager {
     /// Creates a `SyncManager`
     ///
     /// - Parameter subscribers: The `SyncSubscribers to perform during syncs
-    init(subscribers: Array<SynchronizationSubscriber>) {
+    init(subscribers: [SynchronizationSubscriber]) {
         self.subscribers = subscribers
     }
     
@@ -126,7 +126,7 @@ extension SynchronizationManager {
             finish()
         }
         
-        private(set) var subscribers: Array<SynchronizationSubscriber> = []
+        private(set) var subscribers = [SynchronizationSubscriber]()
         
         private var resultsBySubscriber: [String : UIBackgroundFetchResult] = [:]
         
diff --git a/IFTTT SDK/SynchronizationScheduler.swift b/IFTTT SDK/SynchronizationScheduler.swift
diff --git a/IFTTTConnectSDK.podspec b/IFTTTConnectSDK.podspec
diff --git a/SDKHostAppTests/SynchronizationSchedulerTests.swift b/SDKHostAppTests/SynchronizationSchedulerTests.swift

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,17 @@ class ConnectionCredentials: ConnectionCredentialProvider, CustomStringConvertib`
`58`	`58`	`Keys.token : token`
`59`	`59`	`]`
`60`	`60`	`UserDefaults.standard.set(user, forKey: Keys.user)`
	`61`	`+ ConnectButtonController.activate(`
	`62`	`+ connections: [DisplayInformation.locationConnection.connectionId],`
	`63`	`+ lifecycleSynchronizationOptions: .all`
	`64`	`+ )`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`/// Clears the active IFTTT session`
`64`	`68`	`func logout() {`
`65`	`69`	`userToken = nil`
`66`	`70`	`UserDefaults.standard.set(nil, forKey: Keys.user)`
	`71`	`+ ConnectButtonController.deactivate()`
`67`	`72`	`}`
`68`	`73`
`69`	`74`	`/// Creates an instance of ConnectionCredentials`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ class SettingsViewController: UIViewController {`
`60`	`60`	`}`
`61`	`61`	`@IBAction func logoutTapped(_ sender: Any) {`
`62`	`62`	`ConnectionCredentials(settings: settings).logout()`
`63`		`- ConnectButtonController.deactivate()`
`64`	`63`	`update()`
`65`	`64`	`}`
`66`	`65`
Original file line number	Diff line number	Diff line change
`@@ -70,25 +70,24 @@ extension ConnectButtonController {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- /// Performs setup of the SDK. Starts the synchronization of in the SDK. Registers background process with the system if desired.`
	`73`	`+ /// Performs setup of the SDK.Activated synchronization`
`74`	`74`	`///`
`75`	`75`	`/// - Parameters:`
`76`	`76`	/// - credentials: An optional object conforming to `ConnectionCredentialProvider` which is used to setup the SDK. If this is nil, the SDK will attempt to use cached values.
`77`		- /// - lifecycleSynchronizationOptions: An instance of `ApplicationLifecycleSynchronizationOptions` that defines which app lifecycle events the synchronization should occur on. If this parameter is not set, a default value of `ApplicationLifecycleSynchronizationOptions.all` will be used.
`78`		`- public static func setup(with credentials: ConnectionCredentialProvider?,`
`79`		`- lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions = .all) {`
	`77`	`+ public static func setup(with credentials: ConnectionCredentialProvider?) {`
`80`	`78`	`if let credentials = credentials {`
`81`	`79`	`Keychain.update(with: credentials)`
`82`	`80`	`}`
`83`		`- ConnectionsSynchronizer.shared.setup(lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)`
`84`	`81`	`}`
`85`	`82`
`86`	`83`	`/// Call this method to activate the synchronization. This starts synchronization for the parameter connections.`
`87`	`84`	`///`
`88`	`85`	`/// - Parameters:`
`89`	`86`	/// - connections: An optional list of `Connection` to activate synchronization with.
`90`		`- public static func activate(connections ids: [String]? = nil) {`
`91`		`- ConnectionsSynchronizer.shared.activate(connections: ids)`
	`87`	+ /// - lifecycleSynchronizationOptions: An instance of `ApplicationLifecycleSynchronizationOptions` that defines which app lifecycle events the synchronization should occur on. If this parameter is not set, a default value of `ApplicationLifecycleSynchronizationOptions.all` will be used.
	`88`	`+ public static func activate(connections ids: [String]? = nil,`
	`89`	`+ lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions = .all) {`
	`90`	`+ ConnectionsSynchronizer.shared.activate(connections: ids, lifecycleSynchronizationOptions: lifecycleSynchronizationOptions)`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`/// Call this method to deactivate the synchronization of connection and native service data. This stops synchronization and performs cleanup of any stored data. This will also remove any registered geofences.`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ final class SynchronizationManager {`
`36`	`36`	/// Creates a `SyncManager`
`37`	`37`	`///`
`38`	`38`	/// - Parameter subscribers: The `SyncSubscribers to perform during syncs
`39`		`- init(subscribers: Array<SynchronizationSubscriber>) {`
	`39`	`+ init(subscribers: [SynchronizationSubscriber]) {`
`40`	`40`	`self.subscribers = subscribers`
`41`	`41`	`}`
`42`	`42`
`@@ -126,7 +126,7 @@ extension SynchronizationManager {`
`126`	`126`	`finish()`
`127`	`127`	`}`
`128`	`128`
`129`		`- private(set) var subscribers: Array<SynchronizationSubscriber> = []`
	`129`	`+ private(set) var subscribers = [SynchronizationSubscriber]()`
`130`	`130`
`131`	`131`	`private var resultsBySubscriber: [String : UIBackgroundFetchResult] = [:]`
`132`	`132`