New autofill onboarding for existing DDG users

Core/FeatureFlag.swift

@@ -30,6 +30,7 @@ public enum FeatureFlag: String {
     case autofillPasswordGeneration
     case autofillOnByDefault
     case autofillFailureReporting
+    case autofillOnForExistingUsers
     case incontextSignup
     case autoconsentOnByDefault
     case history
@@ -58,6 +59,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.subfeature(AutofillSubfeature.onByDefault))
         case .autofillFailureReporting:
             return .remoteReleasable(.feature(.autofillBreakageReporter))
+        case .autofillOnForExistingUsers:
+            return .remoteReleasable(.subfeature(AutofillSubfeature.onForExistingUsers))
         case .incontextSignup:
             return .remoteReleasable(.feature(.incontextSignup))
         case .autoconsentOnByDefault:

Core/PixelEvent.swift

@@ -219,7 +219,12 @@ extension Pixel {
         case autofillLoginsSaveLoginModalConfirmed
         case autofillLoginsSaveLoginModalDismissed
         case autofillLoginsSaveLoginModalExcludeSiteConfirmed
-
+
+        case autofillLoginsSaveLoginOnboardingModalDisplayed
+        case autofillLoginsSaveLoginOnboardingModalConfirmed
+        case autofillLoginsSaveLoginOnboardingModalDismissed
+        case autofillLoginsSaveLoginOnboardingModalExcludeSiteConfirmed
+
         case autofillLoginsSavePasswordModalDisplayed
         case autofillLoginsSavePasswordModalConfirmed
         case autofillLoginsSavePasswordModalDismissed
@@ -246,10 +251,9 @@ extension Pixel {
         case autofillLoginsFillLoginInlineAuthenticationDeviceAuthCancelled
         case autofillLoginsAutopromptDismissed
 
-        case autofillLoginsFillLoginInlineDisablePromptShown
-        case autofillLoginsFillLoginInlineDisablePromptAutofillKept
-        case autofillLoginsFillLoginInlineDisablePromptAutofillDisabled
-
+        case autofillLoginsFillLoginInlineDisableSnackbarShown
+        case autofillLoginsFillLoginInlineDisableSnackbarOpenSettings
+
         case autofillLoginsSettingsEnabled
         case autofillLoginsSettingsDisabled
         case autofillLoginsSettingsResetExcludedDisplayed
@@ -946,7 +950,12 @@ extension Pixel.Event {
         case .autofillLoginsSaveLoginModalConfirmed: return "m_autofill_logins_save_login_inline_confirmed"
         case .autofillLoginsSaveLoginModalDismissed: return "m_autofill_logins_save_login_inline_dismissed"
         case .autofillLoginsSaveLoginModalExcludeSiteConfirmed: return "m_autofill_logins_save_login_exclude_site_confirmed"
-
+
+        case .autofillLoginsSaveLoginOnboardingModalDisplayed: return "autofill_logins_save_login_inline_onboarding_displayed"
+        case .autofillLoginsSaveLoginOnboardingModalConfirmed: return "autofill_logins_save_login_inline_onboarding_confirmed"
+        case .autofillLoginsSaveLoginOnboardingModalDismissed: return "autofill_logins_save_login_inline_onboarding_dismissed"
+        case .autofillLoginsSaveLoginOnboardingModalExcludeSiteConfirmed: return "autofill_logins_save_login_onboarding_exclude_site_confirmed"
+
         case .autofillLoginsSavePasswordModalDisplayed: return "m_autofill_logins_save_password_inline_displayed"
         case .autofillLoginsSavePasswordModalConfirmed: return "m_autofill_logins_save_password_inline_confirmed"
         case .autofillLoginsSavePasswordModalDismissed: return "m_autofill_logins_save_password_inline_dismissed"
@@ -979,9 +988,8 @@ extension Pixel.Event {
         case .autofillLoginsAutopromptDismissed:
             return "m_autofill_logins_autoprompt_dismissed"
 
-        case .autofillLoginsFillLoginInlineDisablePromptShown: return "m_autofill_logins_save_disable-prompt_shown"
-        case .autofillLoginsFillLoginInlineDisablePromptAutofillKept: return "m_autofill_logins_save_disable-prompt_autofill-kept"
-        case .autofillLoginsFillLoginInlineDisablePromptAutofillDisabled: return "m_autofill_logins_save_disable-prompt_autofill-disabled"
+        case .autofillLoginsFillLoginInlineDisableSnackbarShown: return "autofill_logins_save_disable_snackbar_shown"
+        case .autofillLoginsFillLoginInlineDisableSnackbarOpenSettings: return "autofill_logins_save_disable_snackbar_open_settings"
 
         case .autofillLoginsSettingsEnabled: return "m_autofill_logins_settings_enabled"
         case .autofillLoginsSettingsDisabled: return "m_autofill_logins_settings_disabled"

DuckDuckGo.xcodeproj/project.pbxproj

@@ -950,7 +950,9 @@
 		EE4FB1882A28D11900E5CBA7 /* NetworkProtectionStatusViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4FB1872A28D11900E5CBA7 /* NetworkProtectionStatusViewModel.swift */; };
 		EE50052E29C369D300AE0773 /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE50052D29C369D300AE0773 /* FeatureFlag.swift */; };
 		EE50053029C3BA0800AE0773 /* InternalUserStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE50052F29C3BA0800AE0773 /* InternalUserStore.swift */; };
+		EE5929622C5A8AF40029380B /* AutofillUsageMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5929612C5A8AF40029380B /* AutofillUsageMonitor.swift */; };
 		EE72CA852A862D000043B5B3 /* NetworkProtectionDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE72CA842A862D000043B5B3 /* NetworkProtectionDebugViewController.swift */; };
+		EE7623BE2C5D038200FA061C /* MockFeatureFlagger.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7623BD2C5D038200FA061C /* MockFeatureFlagger.swift */; };
 		EE7917912A83DE93008DFF28 /* CombineTestUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7917902A83DE93008DFF28 /* CombineTestUtilities.swift */; };
 		EE7A92872AC6DE4700832A36 /* NetworkProtectionNotificationIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7A92862AC6DE4700832A36 /* NetworkProtectionNotificationIdentifier.swift */; };
 		EE8594992A44791C008A6D06 /* NetworkProtectionTunnelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8594982A44791C008A6D06 /* NetworkProtectionTunnelController.swift */; };
@@ -2694,7 +2696,9 @@
 		EE4FB1872A28D11900E5CBA7 /* NetworkProtectionStatusViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionStatusViewModel.swift; sourceTree = "<group>"; };
 		EE50052D29C369D300AE0773 /* FeatureFlag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlag.swift; sourceTree = "<group>"; };
 		EE50052F29C3BA0800AE0773 /* InternalUserStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternalUserStore.swift; sourceTree = "<group>"; };
+		EE5929612C5A8AF40029380B /* AutofillUsageMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillUsageMonitor.swift; sourceTree = "<group>"; };
 		EE72CA842A862D000043B5B3 /* NetworkProtectionDebugViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionDebugViewController.swift; sourceTree = "<group>"; };
+		EE7623BD2C5D038200FA061C /* MockFeatureFlagger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFeatureFlagger.swift; sourceTree = "<group>"; };
 		EE7917902A83DE93008DFF28 /* CombineTestUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombineTestUtilities.swift; sourceTree = "<group>"; };
 		EE7A92862AC6DE4700832A36 /* NetworkProtectionNotificationIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionNotificationIdentifier.swift; sourceTree = "<group>"; };
 		EE8594982A44791C008A6D06 /* NetworkProtectionTunnelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionTunnelController.swift; sourceTree = "<group>"; };
@@ -5613,6 +5617,7 @@
 				6F03CB032C32EFA8004179A8 /* MockPixelFiring.swift */,
 				9F23B8082C2BE9B700950875 /* MockURLOpener.swift */,
 				9FEA22332C3271DC006B03BF /* MockTimer.swift */,
+				EE7623BD2C5D038200FA061C /* MockFeatureFlagger.swift */,
 				9F8007252C5261AF003EDAF4 /* MockPrivacyDataReporter.swift */,
 				9F69331C2C5A191400CD6A5D /* MockTutorialSettings.swift */,
 			);
@@ -6002,6 +6007,7 @@
 				C17B59552A03AAC40055F2D1 /* PasswordGeneration */,
 				31951E9328230D8900CAF535 /* Shared */,
 				F407605428131923006B1E0B /* SaveLogin */,
+				EE5929612C5A8AF40029380B /* AutofillUsageMonitor.swift */,
 			);
 			name = Autofill;
 			sourceTree = "<group>";
@@ -7162,6 +7168,7 @@
 				D66F683D2BB333C100AE93E2 /* SubscriptionContainerView.swift in Sources */,
 				851B128822200575004781BC /* Onboarding.swift in Sources */,
 				9FB027192C26BC29009EA190 /* BrowsersComparisonModel.swift in Sources */,
+				EE5929622C5A8AF40029380B /* AutofillUsageMonitor.swift in Sources */,
 				3151F0EE2735800800226F58 /* VoiceSearchFeedbackView.swift in Sources */,
 				37CF91642BB4A82A00BADCAE /* CrashCollectionOnboardingViewModel.swift in Sources */,
 				6F64AA5D2C4920D200CF4489 /* ShortcutAccessoryView.swift in Sources */,
@@ -7513,6 +7520,7 @@
 				F1BDDBFE2C340D9C00459306 /* SubscriptionFlowViewModelTests.swift in Sources */,
 				F1BDDC022C340DDF00459306 /* SyncManagementViewModelTests.swift in Sources */,
 				D625AAEC2BBEF27600BC189A /* TabURLInterceptorTests.swift in Sources */,
+				EE7623BE2C5D038200FA061C /* MockFeatureFlagger.swift in Sources */,
 				5694372B2BE3F2D900C0881B /* SyncErrorHandlerTests.swift in Sources */,
 				987130C7294AAB9F00AB05E0 /* MenuBookmarksViewModelTests.swift in Sources */,
 				858650D32469BFAD00C36F8A /* DaxDialogTests.swift in Sources */,
@@ -10473,7 +10481,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 181.1.0;
+				version = 182.0.0;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "ff87c19636bce8baa34b7984defa779c083f9ce9",
-        "version" : "181.1.0"
+        "revision" : "d67979814bdd3c4c43a38e6694c56f1fdb5969ac",
+        "version" : "182.0.0"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "097e545c737db78cb1d253a87a9acd6dd8ad8497",
-        "version" : "6.4.0"
+        "revision" : "f97053d24c21ea301d4067adbbe0899ff940526a",
+        "version" : "6.7.0"
       }
     },
     {

DuckDuckGo/ActionMessageView.swift

@@ -90,6 +90,7 @@ class ActionMessageView: UIView {
                         numberOfLines: Int = 0,
                         actionTitle: String? = nil,
                         presentationLocation: PresentationLocation = .withBottomBar(andAddressBarBottom: false),
+                        duration: TimeInterval = Constants.duration,
                         onAction: @escaping () -> Void = {},
                         onDidDismiss: @escaping () -> Void = {}) {
         let messageView = loadFromXib()
@@ -99,13 +100,15 @@ class ActionMessageView: UIView {
                                   message: message.string,
                                   actionTitle: actionTitle,
                                   presentationLocation: presentationLocation,
+                                  duration: duration,
                                   onAction: onAction,
                                   onDidDismiss: onDidDismiss)
     }
 
     static func present(message: String,
                         actionTitle: String? = nil,
                         presentationLocation: PresentationLocation = .withBottomBar(andAddressBarBottom: false),
+                        duration: TimeInterval = Constants.duration,
                         onAction: @escaping () -> Void = {},
                         onDidDismiss: @escaping () -> Void = {}) {
         let messageView = loadFromXib()
@@ -114,6 +117,7 @@ class ActionMessageView: UIView {
                                   message: message,
                                   actionTitle: actionTitle,
                                   presentationLocation: presentationLocation,
+                                  duration: duration,
                                   onAction: onAction,
                                   onDidDismiss: onDidDismiss)
     }
@@ -122,6 +126,7 @@ class ActionMessageView: UIView {
                                 message: String,
                                 actionTitle: String? = nil,
                                 presentationLocation: PresentationLocation = .withBottomBar(andAddressBarBottom: false),
+                                duration: TimeInterval = Constants.duration,
                                 onAction: @escaping () -> Void = {},
                                 onDidDismiss: @escaping () -> Void = {}) {
         guard let window = UIApplication.shared.firstKeyWindow else { return }
@@ -159,7 +164,7 @@ class ActionMessageView: UIView {
             messageView?.dismissAndFadeOut()
         }
         messageView.dismissWorkItem = workItem
-        DispatchQueue.main.asyncAfter(deadline: .now() + Constants.duration, execute: workItem)
+        DispatchQueue.main.asyncAfter(deadline: .now() + duration, execute: workItem)
         presentedMessages.append(messageView)
     }
 

DuckDuckGo/AppDelegate.swift

@@ -83,6 +83,7 @@ import WebKit
     private var crashReportUploaderOnboarding: CrashCollectionOnboarding?
 
     private var autofillPixelReporter: AutofillPixelReporter?
+    private var autofillUsageMonitor = AutofillUsageMonitor()
 
     var privacyProDataReporter: PrivacyProDataReporting!
 

DuckDuckGo/AppUserDefaults.swift

@@ -257,12 +257,18 @@ public class AppUserDefaults: AppSettings {
             if let isNewInstall = autofillIsNewInstallForOnByDefault,
                isNewInstall,
                featureFlagger.isFeatureOn(.autofillOnByDefault) {
-                autofillCredentialsHasBeenEnabledAutomaticallyIfNecessary = true
-                autofillCredentialsEnabled = true
+                enableAutofillCredentials()
+            } else if featureFlagger.isFeatureOn(.autofillOnForExistingUsers) {
+                enableAutofillCredentials()
             }
         }
     }
-
+
+    private func enableAutofillCredentials() {
+        autofillCredentialsHasBeenEnabledAutomaticallyIfNecessary = true
+        autofillCredentialsEnabled = true
+    }
+
     var autofillCredentialsEnabled: Bool {
         get {
             // setAutofillCredentialsEnabledAutomaticallyIfNecessary() used here to automatically turn on autofill for people if:

DuckDuckGo/Assets.xcassets/App-DuckDuckGo-32.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "App-DuckDuckGo-32.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/DesignSystemIcons/24px/Autofill-Color-24.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Autofill-Color-24.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/DesignSystemIcons/24px/Lock-Color-24.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Lock-Color-24.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/DesignSystemIcons/24px/Sync-Color-24.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Sync-Color-24.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/AutofillDebugViewController.swift

@@ -42,6 +42,15 @@ class AutofillDebugViewController: UITableViewController {
         }
     }
 
+    @UserDefaultsWrapper(key: .autofillSaveModalRejectionCount, defaultValue: 0)
+    private var autofillSaveModalRejectionCount: Int
+
+    @UserDefaultsWrapper(key: .autofillSaveModalDisablePromptShown, defaultValue: false)
+    private var autofillSaveModalDisablePromptShown: Bool
+
+    @UserDefaultsWrapper(key: .autofillFirstTimeUser, defaultValue: true)
+    private var autofillFirstTimeUser: Bool
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
 
@@ -59,6 +68,10 @@ class AutofillDebugViewController: UITableViewController {
                         eventMapping: EventMapping<AutofillPixelEvent> { _, _, _, _ in })
                 autofillPixelReporter.resetStoreDefaults()
                 ActionMessageView.present(message: "Autofill Data reset")
+                autofillSaveModalRejectionCount = 0
+                autofillSaveModalDisablePromptShown = false
+                autofillFirstTimeUser = true
+                _ = AppDependencyProvider.shared.autofillNeverPromptWebsitesManager.deleteAllNeverPromptWebsites()
             } else if cell.tag == Row.addAutofillData.rawValue {
                 promptForNumberOfLoginsToAdd()
             } else if cell.tag == Row.resetEmailProtectionInContextSignUp.rawValue {

DuckDuckGo/AutofillLoginListViewModel.swift

@@ -88,7 +88,7 @@ final class AutofillLoginListViewModel: ObservableObject {
     private let secureVault: (any AutofillSecureVault)?
     private let autofillNeverPromptWebsitesManager: AutofillNeverPromptWebsitesManager
     private let privacyConfig: PrivacyConfiguration
-    private let breakageReporterKeyValueStoring: KeyValueStoringDictionaryRepresentable
+    private let keyValueStore: KeyValueStoringDictionaryRepresentable
     private var cachedDeletedCredentials: SecureVaultModels.WebsiteCredentials?
     private let autofillDomainNameUrlMatcher = AutofillDomainNameUrlMatcher()
     private let autofillDomainNameUrlSort = AutofillDomainNameUrlSort()
@@ -111,7 +111,7 @@ final class AutofillLoginListViewModel: ObservableObject {
         }
         self?.updateData()
         self?.showBreakageReporter = false
-    }, keyValueStoring: breakageReporterKeyValueStoring, storageConfiguration: .autofillConfig)
+    }, keyValueStoring: keyValueStore, storageConfiguration: .autofillConfig)
 
     @Published private (set) var viewState: AutofillLoginListViewModel.ViewState = .authLocked
     @Published private(set) var sections = [AutofillLoginListSectionType]() {
@@ -138,6 +138,7 @@ final class AutofillLoginListViewModel: ObservableObject {
         get { appSettings.autofillCredentialsEnabled }
         set {
             appSettings.autofillCredentialsEnabled = newValue
+            keyValueStore.set(false, forKey: UserDefaultsWrapper<Bool>.Key.autofillFirstTimeUser.rawValue)
             NotificationCenter.default.post(name: AppUserDefaults.Notifications.autofillEnabledChange, object: self)
         }
     }
@@ -149,15 +150,15 @@ final class AutofillLoginListViewModel: ObservableObject {
          currentTabUid: String? = nil,
          autofillNeverPromptWebsitesManager: AutofillNeverPromptWebsitesManager = AppDependencyProvider.shared.autofillNeverPromptWebsitesManager,
          privacyConfig: PrivacyConfiguration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig,
-         breakageReporterKeyValueStoring: KeyValueStoringDictionaryRepresentable = UserDefaults.standard) {
+         keyValueStore: KeyValueStoringDictionaryRepresentable = UserDefaults.standard) {
         self.appSettings = appSettings
         self.tld = tld
         self.secureVault = secureVault
         self.currentTabUrl = currentTabUrl
         self.currentTabUid = currentTabUid
         self.autofillNeverPromptWebsitesManager = autofillNeverPromptWebsitesManager
         self.privacyConfig = privacyConfig
-        self.breakageReporterKeyValueStoring = breakageReporterKeyValueStoring
+        self.keyValueStore = keyValueStore
 
         if let count = getAccountsCount() {
             authenticationNotRequired = count == 0 || AppDependencyProvider.shared.autofillLoginSession.isSessionValid