[MBL-1147] Track push notifications

Kickstarter-iOS/AppDelegate.swift

@@ -230,17 +230,19 @@ internal final class AppDelegate: UIResponder, UIApplicationDelegate {
       .observeValues { [weak self] writeKey in
         guard let strongSelf = self else { return }
 
-        let (configuration, appBoyInstance) = Analytics.configuredClient(withWriteKey: writeKey)
-
-        appBoyInstance?.saveLaunchOptions(launchOptions)
-        appBoyInstance?.appboyOptions = [
-          ABKInAppMessageControllerDelegateKey: strongSelf,
-          ABKURLDelegateKey: strongSelf,
-          ABKMinimumTriggerTimeIntervalKey: 5
-        ]
+        let configuration = Analytics.configuredClient(withWriteKey: writeKey)
+
+        if let appBoyInstance = SEGAppboyIntegrationFactory.instance() {
+          configuration.use(appBoyInstance)
+          appBoyInstance.saveLaunchOptions(launchOptions)
+          appBoyInstance.appboyOptions = [
+            ABKInAppMessageControllerDelegateKey: strongSelf,
+            ABKURLDelegateKey: strongSelf,
+            ABKMinimumTriggerTimeIntervalKey: 5
+          ]
+        }
 
         Analytics.setup(with: configuration)
-
         AppEnvironment.current.ksrAnalytics.configureSegmentClient(Analytics.shared())
       }
 
@@ -460,10 +462,18 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
   }
 
   func userNotificationCenter(
-    _: UNUserNotificationCenter,
+    _ center: UNUserNotificationCenter,
     didReceive response: UNNotificationResponse,
     withCompletionHandler completion: @escaping () -> Void
   ) {
+    // Track notification opened.
+    // Documentation: https://github.com/Appboy/appboy-segment-ios/blob/master/CHANGELOG.md#added-6.
+    let appBoyHelper = SEGAppboyIntegrationFactory.instance().appboyHelper
+    if Appboy.sharedInstance() == nil {
+      appBoyHelper?.save(center, notificationResponse: response)
+    }
+    appBoyHelper?.userNotificationCenter(center, receivedNotificationResponse: response)
+
     guard let rootTabBarController = self.rootTabBarController else {
       completion()
       return

Library/Tracking/Segment.swift

@@ -6,23 +6,11 @@ public extension Analytics {
   /**
    Returns an `Analytics` and `SEGAppboyIntegrationFactory` instance, with Segment, using an `AnalyticsConfiguration`.
    */
-  static func configuredClient(withWriteKey writeKey: String)
-    -> (AnalyticsConfiguration, SEGAppboyIntegrationFactory?) {
+  static func configuredClient(withWriteKey writeKey: String) -> AnalyticsConfiguration {
     let configuration = AnalyticsConfiguration(writeKey: writeKey)
-    configuration
-      .trackApplicationLifecycleEvents = true
-
+    configuration.trackApplicationLifecycleEvents = true
     configuration.sourceMiddleware = [BrazeDebounceMiddleware()]
-    // Braze is always configured but feature-flagged elsewhere.
-    // Data sent to Braze is feature-flagged by the enabling/disabling Segment.
-    // FIXME: For some reason this instance of SEGAppyboyIntegrationFactory is not the same as one passed in. It's supposed to be the same singleton.
-    guard let factoryInstance = SEGAppboyIntegrationFactory.instance() else {
-      return (configuration, nil)
-    }
-
-    configuration.use(factoryInstance)
-
-    return (configuration, factoryInstance)
+    return configuration
   }
 }