Move pixel sender logic into the main view controller

DuckDuckGo/AppDelegate/AppDelegate.swift

@@ -215,17 +215,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
 #endif
     }
 
-    // Temporary feature flag tester, to validate that phased rollouts are working as intended.
-    // This is to be removed before the end of August 2023.
-    lazy var featureFlagTester: PhasedRolloutFeatureFlagTester = {
-        return PhasedRolloutFeatureFlagTester()
-    }()
-
     func applicationDidBecomeActive(_ notification: Notification) {
         syncService?.initializeIfNeeded(isInternalUser: internalUserDecider?.isInternalUser ?? false)
         syncService?.scheduler.notifyAppLifecycleEvent()
-
-        featureFlagTester.sendFeatureFlagEnabledPixelIfNecessary()
     }
 
     func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {

DuckDuckGo/Main/View/MainViewController.swift

@@ -85,6 +85,7 @@ final class MainViewController: NSViewController {
         view.registerForDraggedTypes([.URL, .fileURL])
 
         registerForBookmarkBarPromptNotifications()
+        registerForDidBecomeActiveNotifications()
     }
 
     var bookmarkBarPromptObserver: Any?
@@ -124,6 +125,19 @@ final class MainViewController: NSViewController {
         updateDividerColor()
     }
 
+    func registerForDidBecomeActiveNotifications() {
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(applicationDidBecomeActive),
+                                               name: NSApplication.didBecomeActiveNotification,
+                                               object: nil)
+    }
+
+    @objc func applicationDidBecomeActive() {
+        // Temporary feature flag tester, to validate that phased rollouts are working as intended.
+        // This is to be removed before the end of August 2023.
+        PhasedRolloutFeatureFlagTester.shared.sendFeatureFlagEnabledPixelIfNecessary()
+    }
+
     override func viewDidLayout() {
         findInPageContainerView.applyDropShadow()
     }

DuckDuckGo/NetworkProtection/PhasedRolloutFeatureFlagTester.swift

@@ -37,6 +37,8 @@ final class PhasedRolloutFeatureFlagTester {
         static let hasSentPixelKey = "network-protection.incremental-feature-flag-test.has-sent-pixel"
     }
 
+    static let shared = PhasedRolloutFeatureFlagTester()
+
     private let privacyConfigurationManager: PrivacyConfigurationManaging
     private let pixelSender: PhasedRolloutPixelSender
     private let userDefaults: UserDefaults
@@ -56,6 +58,7 @@ final class PhasedRolloutFeatureFlagTester {
         }
 
         markPixelAsSent()
+
         pixelSender.sendPixel { [weak self] error in
             if error != nil {
                 self?.markPixelAsUnsent()