Debug menu for survey remote message.

duckduckgo · May 23, 2024 · 2fdcf49 · 2fdcf49
1 parent 47ba861
commit 2fdcf49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
@@ -642,6 +642,10 @@ import SubscriptionUI
                                   currentViewController: { WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController },
                                   subscriptionManager: Application.appDelegate.subscriptionManager)
 
+            NSMenuItem(title: "Privacy Pro Survey") {
+                NSMenuItem(title: "Reset Remote Message Cache", action: #selector(MainViewController.resetSurveyRemoteMessages))
+            }
+
             NSMenuItem(title: "Logging").submenu(setupLoggingMenu())
         }
         debugMenu.addItem(internalUserItem)

diff --git a/DuckDuckGo/Menus/MainMenuActions.swift b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -924,6 +924,11 @@ extension MainViewController {
         setConfigurationUrl(nil)
     }
 
+    @objc func resetSurveyRemoteMessages(_ sender: Any?) {
+        DefaultSurveyRemoteMessagingStorage.surveys().removeStoredAndDismissedMessages()
+        DefaultSurveyRemoteMessaging(subscriptionManager: Application.appDelegate.subscriptionManager).resetLastRefreshTimestamp()
+    }
+
     // MARK: - Developer Tools
 
     @objc func toggleDeveloperTools(_ sender: Any?) {

diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
@@ -76,9 +76,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
 
                 NSMenuItem(title: "Remove Network Extension and Login Items", action: #selector(NetworkProtectionDebugMenu.removeSystemExtensionAndAgents))
                     .targetting(self)
-
-                NSMenuItem(title: "Reset Remote Messages", action: #selector(NetworkProtectionDebugMenu.resetNetworkProtectionRemoteMessages))
-                    .targetting(self)
             }
 
             NSMenuItem.separator()
@@ -483,11 +480,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
         overrideNetworkProtectionActivationDate(to: nil)
     }
 
-    @objc func resetNetworkProtectionRemoteMessages(_ sender: Any?) {
-        DefaultSurveyRemoteMessagingStorage.surveys().removeStoredAndDismissedMessages()
-        DefaultSurveyRemoteMessaging(subscriptionManager: Application.appDelegate.subscriptionManager).resetLastRefreshTimestamp()
-    }
-
     @objc func overrideNetworkProtectionActivationDateToNow(_ sender: Any?) {
         overrideNetworkProtectionActivationDate(to: Date())
     }