Merge branch 'main' into jacek/refactor-app-delegate-m1

duckduckgo · Dec 20, 2024 · d5663f3 · d5663f3
2 parents ff80734 + c4ac58d
commit d5663f3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -165,6 +165,16 @@ public struct PixelParameters {
 
     public static let appState = "state"
     public static let appEvent = "event"
+
+    public static let firstBackgroundTimestamp = "firstBackgroundTimestamp"
+    public static let secondBackgroundTimestamp = "secondBackgroundTimestamp"
+    public static let didReceiveMemoryWarningTimestamp = "didReceiveMemoryWarningTimestamp"
+    public static let didReceiveMXPayloadTimestamp = "didReceiveMXPayloadTimestamp"
+    public static let didReceiveUNNotification = "didReceiveUNNotification"
+    public static let didStartRemoteMessagingClientBackgroundTask = "didStartRemoteMessagingClientBackgroundTask"
+    public static let didStartAppConfigurationFetchBackgroundTask = "didStartAppConfigurationFetchBackgroundTask"
+    public static let didPerformFetchTimestamp = "didPerformFetchTimestamp"
+    public static let numberOfBackgrounds = "numberOfBackgrounds"
 }
 
 public struct PixelValues {

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -947,6 +947,7 @@ extension Pixel {
 
         // MARK: Lifecycle
         case appDidTransitionToUnexpectedState
+        case appDidConsecutivelyBackground
     }
 
 }
@@ -1891,6 +1892,7 @@ extension Pixel.Event {
 
         // MARK: Lifecycle
         case .appDidTransitionToUnexpectedState: return "m_debug_app-did-transition-to-unexpected-state-2"
+        case .appDidConsecutivelyBackground: return "m_debug_app-did-consecutively-background"
 
         }
     }

diff --git a/DuckDuckGo/AppConfigurationFetch.swift b/DuckDuckGo/AppConfigurationFetch.swift
@@ -85,6 +85,8 @@ class AppConfigurationFetch {
         return Date().timeIntervalSince(Self.lastConfigurationRefreshDate) > Constants.minimumConfigurationRefreshInterval
     }
 
+    static var didStartBackgroundTaskTimestamp: Date?
+
     enum BackgroundRefreshCompletionStatus {
 
         case expired
@@ -132,6 +134,7 @@ class AppConfigurationFetch {
 
     static func registerBackgroundRefreshTaskHandler() {
         BGTaskScheduler.shared.register(forTaskWithIdentifier: Constants.backgroundProcessingTaskIdentifier, using: nil) { (task) in
+            didStartBackgroundTaskTimestamp = Date()
             guard shouldRefresh else {
                 task.setTaskCompleted(success: true)
                 scheduleBackgroundRefreshTask()

diff --git a/DuckDuckGo/RemoteMessagingClient.swift b/DuckDuckGo/RemoteMessagingClient.swift
@@ -48,6 +48,8 @@ final class RemoteMessagingClient: RemoteMessagingProcessing {
     let store: RemoteMessagingStoring
     let remoteMessagingAvailabilityProvider: RemoteMessagingAvailabilityProviding
 
+    var didStartBackgroundTaskTimestamp: Date?
+
     convenience init(
         bookmarksDatabase: CoreDataDatabase,
         appSettings: AppSettings,
@@ -113,7 +115,8 @@ extension RemoteMessagingClient {
         let remoteMessagingAvailabilityProvider = remoteMessagingAvailabilityProvider
         let store = store
 
-        BGTaskScheduler.shared.register(forTaskWithIdentifier: Constants.backgroundRefreshTaskIdentifier, using: nil) { task in
+        BGTaskScheduler.shared.register(forTaskWithIdentifier: Constants.backgroundRefreshTaskIdentifier, using: nil) { [weak self] task in
+            self?.didStartBackgroundTaskTimestamp = Date()
             guard Self.shouldRefresh else {
                 task.setTaskCompleted(success: true)
                 Self.scheduleBackgroundRefreshTask()