Merge pull request #273 from IFTTT/hotfix/crash_fix_notification_obse…

…rver_change Localization crash fix and notification observer cleanup fix
IFTTT · Mar 16, 2021 · 22814bc · 22814bc
2 parents 4af9d49 + bd56af7
commit 22814bc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/IFTTT SDK/ConnectButtonController.swift b/IFTTT SDK/ConnectButtonController.swift
@@ -131,9 +131,6 @@ public class ConnectButtonController {
                                    state: state)
             let activation = ConnectionActivation(userToken: userToken,
                                                   connection: connection)
-            if connection.hasNativeTriggers {
-                connectionsRegistry.update(with: connection)
-            }
             delegate?.connectButtonController(self, didFinishActivationWithResult: .success(activation))
         }
     }
@@ -268,7 +265,7 @@ public class ConnectButtonController {
         }
 
         if connection.hasNativeTriggers {
-            connectionsRegistry.update(with: connection)
+            connectionsRegistry.update(with: connection, shouldNotify: false)
         }
 
         Analytics.shared.track(.Impression,
@@ -423,6 +420,18 @@ public class ConnectButtonController {
             return NSAttributedString(string: "IFTTT",
                                       attributes: [.font : Constants.iftttWordmarkFont])
         }
+
+        private func substituteIftttWordmark(with string: String) -> NSMutableAttributedString {
+            let iftttRange = (string as NSString).range(of: "IFTTT")
+            let text = NSMutableAttributedString(string: string,
+                                                 attributes: [.font : Constants.footnoteFont])
+            if iftttRange.location == NSNotFound {
+                return text
+            }
+
+            text.replaceCharacters(in: iftttRange, with: iftttWordmark)
+            return text
+        }
 
         var value: ConnectButton.LabelValue {
             return .attributed(attributedString)
@@ -440,10 +449,7 @@ public class ConnectButtonController {
 
             case .enterEmail:
                 let string = "button.footer.email.prefix".localized + " "
-                let text = NSMutableAttributedString(string: string,
-                                                     attributes: [.font : Constants.footnoteFont])
-                let iftttRange = (string as NSString).range(of: "IFTTT")
-                text.replaceCharacters(in: iftttRange, with: iftttWordmark)
+                let text = substituteIftttWordmark(with: string)
 
                 text.append(NSAttributedString(string: " ")) // Adds a space before the underline starts
                 text.append(NSAttributedString(string: "button.footer.email.postfix".localized,
@@ -459,10 +465,7 @@ public class ConnectButtonController {
 
             case let .creatingAccount(email):
                 let string = "button.footer.accountCreation".localized(with: email)
-                let text = NSMutableAttributedString(string: string,
-                                                     attributes: [.font : Constants.footnoteFont])
-                let iftttRange = (string as NSString).range(of: "IFTTT")
-                text.replaceCharacters(in: iftttRange, with: iftttWordmark)
+                let text = substituteIftttWordmark(with: string)
                 return text
 
             case .loadingFailed:

diff --git a/IFTTT SDK/SynchronizationScheduler.swift b/IFTTT SDK/SynchronizationScheduler.swift
@@ -57,6 +57,8 @@ final class SynchronizationScheduler {
     }
 
     func setup(lifecycleSynchronizationOptions: ApplicationLifecycleSynchronizationOptions) {
+        removeLifecycleNotificationObservers()
+
         // Start synchronization on system events
         var appLifecycleEventTuples = [(NSNotification.Name, SynchronizationSource, Bool)]()
 
@@ -77,6 +79,9 @@ final class SynchronizationScheduler {
     /// Performs registration for system and SDK generated events for kicking off synchronizations
     /// Should get called when the scheduler is to start.
     func start() {
+        // Remove any previous tokens that might still be aroind
+        removeSDKGeneratedNotificationObservers()
+
         // Start the manager
         manager.start()
 
@@ -101,9 +106,8 @@ final class SynchronizationScheduler {
 
         // Unregister from background process
         // Remove observers from notification center
-        [applicationLifecycleNotificationCenterTokens + sdkGeneratedNotificationCenterTokens].forEach {
-            NotificationCenter.default.removeObserver($0)
-        }
+        removeLifecycleNotificationObservers()
+        removeSDKGeneratedNotificationObservers()
 
         applicationLifecycleNotificationCenterTokens = []
         sdkGeneratedNotificationCenterTokens = []
@@ -119,6 +123,18 @@ final class SynchronizationScheduler {
         subscriberToken = nil
     }
 
+    private func removeLifecycleNotificationObservers() {
+        applicationLifecycleNotificationCenterTokens.forEach {
+            NotificationCenter.default.removeObserver($0)
+        }
+    }
+
+    private func removeSDKGeneratedNotificationObservers() {
+        sdkGeneratedNotificationCenterTokens.forEach {
+            NotificationCenter.default.removeObserver($0)
+        }
+    }
+
     /// Sets up subscriber with app generated triggers.
     private func setupSubscribers() {
         guard subscriberToken == nil else { return }