Merge branch 'develop' into fcappelli/breakage_report_improvements

# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Nov 28, 2023 · db29e27 · db29e27
2 parents f334cf6 + ac1cd2c
commit db29e27
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 99 deletions.
diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -126,8 +126,6 @@ public struct PixelParameters {
     public static let returnUserErrorCode = "error_code"
     public static let returnUserOldATB = "old_atb"
     public static let returnUserNewATB = "new_atb"
-
-    public static let autofillDefaultState = "default_state"
 }
 
 public struct PixelValues {

diff --git a/DuckDuckGo/AutofillLoginPromptViewController.swift b/DuckDuckGo/AutofillLoginPromptViewController.swift
@@ -69,11 +69,9 @@ class AutofillLoginPromptViewController: UIViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         if trigger == AutofillUserScript.GetTriggerType.autoprompt {
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptDisplayed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptDisplayed)
         } else {
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDisplayed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDisplayed)
         }
     }
 
@@ -97,11 +95,9 @@ class AutofillLoginPromptViewController: UIViewController {
 extension AutofillLoginPromptViewController: UISheetPresentationControllerDelegate {
     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
         if self.trigger == AutofillUserScript.GetTriggerType.autoprompt {
-            Pixel.fire(pixel: .autofillLoginsAutopromptDismissed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsAutopromptDismissed)
         } else {
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed)
         }
         completion?(nil, false)
     }
@@ -111,11 +107,9 @@ extension AutofillLoginPromptViewController: AutofillLoginPromptViewModelDelegat
     func autofillLoginPromptViewModel(_ viewModel: AutofillLoginPromptViewModel, didSelectAccount account: SecureVaultModels.WebsiteAccount) {
 
         if trigger == AutofillUserScript.GetTriggerType.autoprompt {
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptConfirmed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptConfirmed)
         } else {
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualConfirmed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualConfirmed)
         }
 
         if AppDependencyProvider.shared.autofillLoginSession.isValidSession {
@@ -169,11 +163,9 @@ extension AutofillLoginPromptViewController: AutofillLoginPromptViewModelDelegat
     func autofillLoginPromptViewModelDidCancel(_ viewModel: AutofillLoginPromptViewModel) {
         dismiss(animated: true) {
             if self.trigger == AutofillUserScript.GetTriggerType.autoprompt {
-                Pixel.fire(pixel: .autofillLoginsAutopromptDismissed,
-                           withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+                Pixel.fire(pixel: .autofillLoginsAutopromptDismissed)
             } else {
-                Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed,
-                           withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+                Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed)
             }
 
             self.completion?(nil, false)

diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift
@@ -693,11 +693,9 @@ extension AutofillLoginSettingsListViewController: AutofillLoginDetailsViewContr
 extension AutofillLoginSettingsListViewController: EnableAutofillSettingsTableViewCellDelegate {
     func enableAutofillSettingsTableViewCell(_ cell: EnableAutofillSettingsTableViewCell, didChangeSettings value: Bool) {
         if value {
-            Pixel.fire(pixel: .autofillLoginsSettingsEnabled,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsSettingsEnabled)
         } else {
-            Pixel.fire(pixel: .autofillLoginsSettingsDisabled,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsSettingsDisabled)
         }
 
         viewModel.isAutofillEnabledInSettings = value

diff --git a/DuckDuckGo/AutofillSettingStatus.swift b/DuckDuckGo/AutofillSettingStatus.swift
@@ -30,8 +30,4 @@ struct AutofillSettingStatus {
         let canAuthenticate = context.canEvaluatePolicy(.deviceOwnerAuthentication, error: &error)
         return appSettings.autofillCredentialsEnabled && canAuthenticate
     }
-
-    static var defaultState: String {
-        return appSettings.autofillCredentialsHasBeenEnabledAutomaticallyIfNecessary ? "on" : "off"
-    }
 }
diff --git a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
@@ -54,9 +54,9 @@ extension NetworkProtectionKeychainTokenStore {
 
 extension NetworkProtectionCodeRedemptionCoordinator {
     convenience init() {
-        let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults)
+        let settings = VPNSettings(defaults: .networkProtectionGroupDefaults)
         self.init(
-            environment: tunnelSettings.selectedEnvironment,
+            environment: settings.selectedEnvironment,
             tokenStore: NetworkProtectionKeychainTokenStore(),
             errorEvents: .networkProtectionAppDebugEvents
         )
@@ -65,27 +65,24 @@ extension NetworkProtectionCodeRedemptionCoordinator {
 
 extension NetworkProtectionVPNNotificationsViewModel {
     convenience init() {
-        let notificationsSettingsStore = NetworkProtectionNotificationsSettingsUserDefaultsStore(userDefaults: .networkProtectionGroupDefaults)
         self.init(
             notificationsAuthorization: NotificationsAuthorizationController(),
-            notificationsSettingsStore: notificationsSettingsStore
+            settings: VPNSettings(defaults: .networkProtectionGroupDefaults)
         )
     }
 }
 
 extension NetworkProtectionVPNSettingsViewModel {
     convenience init() {
-        self.init(
-            tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults)
-        )
+        self.init(settings: VPNSettings(defaults: .networkProtectionGroupDefaults))
     }
 }
 
 extension NetworkProtectionLocationListCompositeRepository {
     convenience init() {
-        let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults)
+        let settings = VPNSettings(defaults: .networkProtectionGroupDefaults)
         self.init(
-            environment: tunnelSettings.selectedEnvironment,
+            environment: settings.selectedEnvironment,
             tokenStore: NetworkProtectionKeychainTokenStore()
         )
     }
@@ -96,7 +93,7 @@ extension NetworkProtectionVPNLocationViewModel {
         let locationListRepository = NetworkProtectionLocationListCompositeRepository()
         self.init(
             locationListRepository: locationListRepository,
-            tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults)
+            settings: VPNSettings(defaults: .networkProtectionGroupDefaults)
         )
     }
 }

diff --git a/DuckDuckGo/NetworkProtectionVPNLocationViewModel.swift b/DuckDuckGo/NetworkProtectionVPNLocationViewModel.swift
@@ -25,7 +25,7 @@ import NetworkProtection
 
 final class NetworkProtectionVPNLocationViewModel: ObservableObject {
     private let locationListRepository: NetworkProtectionLocationListRepository
-    private let tunnelSettings: TunnelSettings
+    private let settings: VPNSettings
     @Published public var state: LoadingState
     @Published public var isNearestSelected: Bool
 
@@ -43,32 +43,32 @@ final class NetworkProtectionVPNLocationViewModel: ObservableObject {
         }
     }
 
-    init(locationListRepository: NetworkProtectionLocationListRepository, tunnelSettings: TunnelSettings) {
+    init(locationListRepository: NetworkProtectionLocationListRepository, settings: VPNSettings) {
         self.locationListRepository = locationListRepository
-        self.tunnelSettings = tunnelSettings
+        self.settings = settings
         state = .loading
-        self.isNearestSelected = tunnelSettings.selectedLocation == .nearest
+        self.isNearestSelected = settings.selectedLocation == .nearest
     }
 
     func onViewAppeared() async {
         await reloadList()
     }
 
     func onNearestItemSelection() async {
-        tunnelSettings.selectedLocation = .nearest
+        settings.selectedLocation = .nearest
         await reloadList()
     }
 
     func onCountryItemSelection(id: String, cityId: String? = nil) async {
         let location = NetworkProtectionSelectedLocation(country: id, city: cityId)
-        tunnelSettings.selectedLocation = .location(location)
+        settings.selectedLocation = .location(location)
         await reloadList()
     }
 
     @MainActor
     private func reloadList() async {
         guard let list = try? await locationListRepository.fetchLocationList() else { return }
-        let selectedLocation = self.tunnelSettings.selectedLocation
+        let selectedLocation = self.settings.selectedLocation
         let isNearestSelected = selectedLocation == .nearest
 
         let countryItems = list.map { currentLocation in

diff --git a/DuckDuckGo/NetworkProtectionVPNNotificationsViewModel.swift b/DuckDuckGo/NetworkProtectionVPNNotificationsViewModel.swift
@@ -31,16 +31,16 @@ enum NetworkProtectionNotificationsViewKind: Equatable {
 
 final class NetworkProtectionVPNNotificationsViewModel: ObservableObject {
     private var notificationsAuthorization: NotificationsAuthorizationControlling
-    private var notificationsSettingsStore: NetworkProtectionNotificationsSettingsStore
+    private var settings: VPNSettings
     @Published var viewKind: NetworkProtectionNotificationsViewKind = .loading
     var alertsEnabled: Bool {
-        self.notificationsSettingsStore.alertsEnabled
+        self.settings.notifyStatusChanges
     }
 
     init(notificationsAuthorization: NotificationsAuthorizationControlling,
-         notificationsSettingsStore: NetworkProtectionNotificationsSettingsStore) {
+         settings: VPNSettings) {
         self.notificationsAuthorization = notificationsAuthorization
-        self.notificationsSettingsStore = notificationsSettingsStore
+        self.settings = settings
         self.notificationsAuthorization.delegate = self
     }
 
@@ -55,7 +55,7 @@ final class NetworkProtectionVPNNotificationsViewModel: ObservableObject {
     }
 
     func didToggleAlerts(to enabled: Bool) {
-        notificationsSettingsStore.alertsEnabled = enabled
+        settings.notifyStatusChanges = enabled
     }
 
     private func updateViewKind(for authorizationStatus: UNAuthorizationStatus) {

diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift b/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift
@@ -24,14 +24,14 @@ import NetworkProtection
 import Combine
 
 final class NetworkProtectionVPNSettingsViewModel: ObservableObject {
-    private let tunnelSettings: TunnelSettings
+    private let settings: VPNSettings
     private var cancellable: AnyCancellable?
 
     @Published public var preferredLocation: String = UserText.netPPreferredLocationNearest
 
-    init(tunnelSettings: TunnelSettings) {
-        self.tunnelSettings = tunnelSettings
-        cancellable = tunnelSettings.selectedLocationPublisher.map { selectedLocation in
+    init(settings: VPNSettings) {
+        self.settings = settings
+        cancellable = settings.selectedLocationPublisher.map { selectedLocation in
             guard let selectedLocation = selectedLocation.location else {
                 return UserText.netPPreferredLocationNearest
             }

diff --git a/DuckDuckGo/PasswordGenerationPromptViewController.swift b/DuckDuckGo/PasswordGenerationPromptViewController.swift
@@ -49,8 +49,7 @@ class PasswordGenerationPromptViewController: UIViewController {
 
         setupPasswordGenerationPromptView()
 
-        Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDisplayed,
-                   withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+        Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDisplayed)
     }
 
     private func setupPasswordGenerationPromptView() {
@@ -68,26 +67,23 @@ class PasswordGenerationPromptViewController: UIViewController {
 
 extension PasswordGenerationPromptViewController: UISheetPresentationControllerDelegate {
     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
-            Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed)
 
         self.completion?(false)
     }
 }
 
 extension PasswordGenerationPromptViewController: PasswordGenerationPromptViewModelDelegate {
     func passwordGenerationPromptViewModelDidSelect(_ viewModel: PasswordGenerationPromptViewModel) {
-        Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptConfirmed,
-                   withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+        Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptConfirmed)
 
         dismiss(animated: true) {
             self.completion?(true)
         }
     }
 
     func passwordGenerationPromptViewModelDidCancel(_ viewModel: PasswordGenerationPromptViewModel) {
-        Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed,
-                   withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+        Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed)
 
         dismiss(animated: true) {
             self.completion?(false)

diff --git a/DuckDuckGo/SaveLoginViewController.swift b/DuckDuckGo/SaveLoginViewController.swift
@@ -72,11 +72,9 @@ class SaveLoginViewController: UIViewController {
         }
         switch viewModel.layoutType {
         case .newUser, .saveLogin:
-            Pixel.fire(pixel: .autofillLoginsSaveLoginModalDismissed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsSaveLoginModalDismissed)
         case .savePassword:
-            Pixel.fire(pixel: .autofillLoginsSavePasswordModalDismissed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsSavePasswordModalDismissed)
         case .updateUsername:
             Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDismissed)
         case .updatePassword:
@@ -98,11 +96,9 @@ class SaveLoginViewController: UIViewController {
 
         switch saveViewModel.layoutType {
         case .newUser, .saveLogin:
-            Pixel.fire(pixel: .autofillLoginsSaveLoginModalDisplayed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsSaveLoginModalDisplayed)
         case .savePassword:
-            Pixel.fire(pixel: .autofillLoginsSavePasswordModalDisplayed,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsSavePasswordModalDisplayed)
         case .updateUsername:
             Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDisplayed)
         case .updatePassword:
@@ -116,11 +112,9 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate {
         switch viewModel.layoutType {
         case .saveLogin, .savePassword, .newUser:
             if viewModel.layoutType == .savePassword {
-                Pixel.fire(pixel: .autofillLoginsSavePasswordModalConfirmed,
-                           withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+                Pixel.fire(pixel: .autofillLoginsSavePasswordModalConfirmed)
             } else {
-                Pixel.fire(pixel: .autofillLoginsSaveLoginModalConfirmed,
-                           withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+                Pixel.fire(pixel: .autofillLoginsSaveLoginModalConfirmed)
             }
             delegate?.saveLoginViewController(self, didSaveCredentials: credentialManager.credentials)
         case .updatePassword, .updateUsername:
@@ -152,17 +146,15 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate {
         alertController.overrideUserInterfaceStyle()
 
         let disableAction = UIAlertAction(title: UserText.autofillKeepEnabledAlertDisableAction, style: .cancel) { _ in
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillDisabled,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillDisabled)
             if isSelfPresentingAlert {
                 self.delegate?.saveLoginViewControllerDidCancel(self)
             }
             AppDependencyProvider.shared.appSettings.autofillCredentialsEnabled = false
         }
 
         let keepUsingAction = UIAlertAction(title: UserText.autofillKeepEnabledAlertKeepUsingAction, style: .default) { _ in
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillKept,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillKept)
             if isSelfPresentingAlert {
                 self.delegate?.saveLoginViewControllerDidCancel(self)
             }
@@ -176,8 +168,7 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate {
         if isAlreadyDismissed {
             delegate?.saveLoginViewController(self, didRequestPresentConfirmKeepUsingAlertController: alertController)
         } else {
-            Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown,
-                       withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+            Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown)
             present(alertController, animated: true)
         }
     }

diff --git a/DuckDuckGo/SettingsViewController.swift b/DuckDuckGo/SettingsViewController.swift
@@ -399,8 +399,7 @@ class SettingsViewController: UITableViewController {
             syncDataProviders: syncDataProviders
         )
         autofillController.delegate = self
-        Pixel.fire(pixel: .autofillSettingsOpened,
-                   withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+        Pixel.fire(pixel: .autofillSettingsOpened)
         navigationController?.pushViewController(autofillController, animated: animated)
     }
 

diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
@@ -2571,8 +2571,7 @@ extension TabViewController: SaveLoginViewControllerDelegate {
 
     func saveLoginViewController(_ viewController: SaveLoginViewController,
                                  didRequestPresentConfirmKeepUsingAlertController alertController: UIAlertController) {
-        Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown,
-                   withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+        Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown)
         present(alertController, animated: true)
     }
 }

diff --git a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
@@ -369,8 +369,7 @@ extension TabViewController {
     }
 
     private func onOpenAutofillLoginsAction() {
-        Pixel.fire(pixel: .browsingMenuAutofill,
-                   withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState])
+        Pixel.fire(pixel: .browsingMenuAutofill)
         delegate?.tabDidRequestAutofillLogins(tab: self)
     }