Rename and add didPerformFetch timestamp

duckduckgo · Dec 20, 2024 · d8cd0a4 · d8cd0a4
1 parent 0a694ec
commit d8cd0a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -918,7 +918,7 @@ import os.log
     func application(_ application: UIApplication, performFetchWithCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
 
         Logger.lifecycle.debug(#function)
-
+        didPerformFetchTimestamp = Date()
         AppConfigurationFetch().start(isBackgroundFetch: true) { result in
             switch result {
             case .noData:
@@ -1171,13 +1171,15 @@ import os.log
         didReceiveMemoryWarningTimestamp = Date()
     }
     var didReceiveMXPayloadTimestamp: Date?
-    var didReceiveUNNotification: Date?
-    var didStartRemoteMessagingClientBackgroundTask: Date? {
+    var didReceiveUNNotificationTimestamp: Date?
+    var didStartRemoteMessagingClientBackgroundTaskTimestamp: Date? {
         remoteMessagingClient.didStartBackgroundTaskTimestamp
     }
-    var didStartAppConfigurationFetchBackgroundTask: Date? {
+    var didStartAppConfigurationFetchBackgroundTaskTimestamp: Date? {
         AppConfigurationFetch.didStartBackgroundTaskTimestamp
     }
+
+    var didPerformFetchTimestamp: Date?
 }
 
 extension AppDelegate: BlankSnapshotViewRecoveringDelegate {
@@ -1230,7 +1232,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 didReceive response: UNNotificationResponse,
                                 withCompletionHandler completionHandler: @escaping () -> Void) {
-        didReceiveUNNotification = Date()
+        didReceiveUNNotificationTimestamp = Date()
         if response.actionIdentifier == UNNotificationDefaultActionIdentifier {
             let identifier = response.notification.request.identifier
 

diff --git a/DuckDuckGo/AppLifecycle/AppStates/Background.swift b/DuckDuckGo/AppLifecycle/AppStates/Background.swift
@@ -67,17 +67,17 @@ struct DoubleBackground: AppState {
                 isValid(timestamp: didReceiveMXPayloadTimestamp) {
                 parameters[PixelParameters.didReceiveMXPayloadTimestamp] = dateFormatter.string(from: didReceiveMXPayloadTimestamp)
             }
-            if let didReceiveUNNotification = appDelegate.didReceiveUNNotification,
-                isValid(timestamp: didReceiveUNNotification) {
-                parameters[PixelParameters.didReceiveUNNotification] = dateFormatter.string(from: didReceiveUNNotification)
+            if let didReceiveUNNotificationTimestamp = appDelegate.didReceiveUNNotificationTimestamp,
+                isValid(timestamp: didReceiveUNNotificationTimestamp) {
+                parameters[PixelParameters.didReceiveUNNotification] = dateFormatter.string(from: didReceiveUNNotificationTimestamp)
             }
-            if let didStartRemoteMessagingClientBackgroundTask = appDelegate.didStartRemoteMessagingClientBackgroundTask,
-                isValid(timestamp: didStartRemoteMessagingClientBackgroundTask) {
-                parameters[PixelParameters.didStartRemoteMessagingClientBackgroundTask] = dateFormatter.string(from: didStartRemoteMessagingClientBackgroundTask)
+            if let didStartRemoteMessagingClientBackgroundTaskTimestamp = appDelegate.didStartRemoteMessagingClientBackgroundTaskTimestamp,
+                isValid(timestamp: didStartRemoteMessagingClientBackgroundTaskTimestamp) {
+                parameters[PixelParameters.didStartRemoteMessagingClientBackgroundTask] = dateFormatter.string(from: didStartRemoteMessagingClientBackgroundTaskTimestamp)
             }
-            if let didStartAppConfigurationFetchBackgroundTask = appDelegate.didStartAppConfigurationFetchBackgroundTask,
-                isValid(timestamp: didStartAppConfigurationFetchBackgroundTask) {
-                parameters[PixelParameters.didStartAppConfigurationFetchBackgroundTask] = dateFormatter.string(from: didStartAppConfigurationFetchBackgroundTask)
+            if let didStartAppConfigurationFetchBackgroundTaskTimestamp = appDelegate.didStartAppConfigurationFetchBackgroundTaskTimestamp,
+                isValid(timestamp: didStartAppConfigurationFetchBackgroundTaskTimestamp) {
+                parameters[PixelParameters.didStartAppConfigurationFetchBackgroundTask] = dateFormatter.string(from: didStartAppConfigurationFetchBackgroundTaskTimestamp)
             }
         }
         Pixel.fire(pixel: .appDidConsecutivelyBackground, withAdditionalParameters: parameters)