Address autofill security concerns with copy changes

DuckDuckGo.xcodeproj/project.pbxproj

@@ -2882,6 +2882,8 @@
  EEC8EB402982CD550065AA39 /* JSAlertViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF53E172950CED5002D78F4 /* JSAlertViewModelTests.swift */; };
  EECE10E529DD77E60044D027 /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECE10E429DD77E60044D027 /* FeatureFlag.swift */; };
  EECE10E629DD77E60044D027 /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECE10E429DD77E60044D027 /* FeatureFlag.swift */; };
+ EED4D3D82C874AE200C79EEA /* PopoverInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED4D3D72C874AE200C79EEA /* PopoverInfoViewController.swift */; };
+ EED4D3D92C874AE200C79EEA /* PopoverInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED4D3D72C874AE200C79EEA /* PopoverInfoViewController.swift */; };
  EED4D3DF2C8A298D00C79EEA /* AutofillPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED4D3DE2C8A298D00C79EEA /* AutofillPixelEvent.swift */; };
  EED4D3E02C8A298D00C79EEA /* AutofillPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED4D3DE2C8A298D00C79EEA /* AutofillPixelEvent.swift */; };
  EED735362BB46B6000F173D6 /* AutocompleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED735352BB46B6000F173D6 /* AutocompleteTests.swift */; };
@@ -4616,6 +4618,7 @@
  EEC4A6702B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNLocationPreferenceItem.swift; sourceTree = "<group>"; };
  EEC7BE2D2BC6C09400F86835 /* AddressBarKeyboardShortcutsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressBarKeyboardShortcutsTests.swift; sourceTree = "<group>"; };
  EECE10E429DD77E60044D027 /* FeatureFlag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlag.swift; sourceTree = "<group>"; };
+ EED4D3D72C874AE200C79EEA /* PopoverInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverInfoViewController.swift; sourceTree = "<group>"; };
  EED4D3DE2C8A298D00C79EEA /* AutofillPixelEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillPixelEvent.swift; sourceTree = "<group>"; };
  EED735352BB46B6000F173D6 /* AutocompleteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutocompleteTests.swift; sourceTree = "<group>"; };
  EED9A6732C37FE6800E0FAB9 /* login_deduplication_test_data.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = login_deduplication_test_data.csv; sourceTree = "<group>"; };
@@ -7415,6 +7418,7 @@
  B65536902684409300085A79 /* Geolocation */,
  AAE75275263B036300B973F8 /* History */,
  AAE71DB225F66A0900D74437 /* HomePage */,
+ EED4D3D62C87480B00C79EEA /* InfoViews */,
  56CEE9092B7A66C500CF10AA /* Info.plist */,
  56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */,
  EEAEA3F4294D05CF00D04DF3 /* JSAlert */,
@@ -9168,6 +9172,14 @@
  path = AppAndExtensionAndAgentTargets;
  sourceTree = "<group>";
  };
+ EED4D3D62C87480B00C79EEA /* InfoViews */ = {
+ isa = PBXGroup;
+ children = (
+ EED4D3D72C874AE200C79EEA /* PopoverInfoViewController.swift */,
+ );
+ path = InfoViews;
+ sourceTree = "<group>";
+ };
  EEE0E1CB2C32F53C0058E148 /* DataImport */ = {
  isa = PBXGroup;
  children = (
@@ -10656,6 +10668,7 @@
  FD22255E2C64B68500199373 /* AutoconsentExperiment.swift in Sources */,
  3706FAD7293F65D500E42796 /* Feedback.swift in Sources */,
  1D0DE9422C3BB9CC0037ABC2 /* ReleaseNotesParser.swift in Sources */,
+ EED4D3D92C874AE200C79EEA /* PopoverInfoViewController.swift in Sources */,
  3707C722294B5D2900682A9F /* WKWebViewExtension.swift in Sources */,
  3706FAD9293F65D500E42796 /* FirefoxFaviconsReader.swift in Sources */,
  3706FADB293F65D500E42796 /* ContentBlockingRulesUpdateObserver.swift in Sources */,
@@ -12564,6 +12577,7 @@
  856CADF0271710F400E79BB0 /* HoverUserScript.swift in Sources */,
  B6DE57F62B05EA9000CD54B9 /* SheetHostingWindow.swift in Sources */,
  AA6EF9B525081B4C004754E6 /* MainMenuActions.swift in Sources */,
+ EED4D3D82C874AE200C79EEA /* PopoverInfoViewController.swift in Sources */,
  56A0541F2C1CA1F5007D8FAB /* OnboardingTabExtension.swift in Sources */,
  B63D466925BEB6C200874977 /* WKWebView+SessionState.swift in Sources */,
  B6F1B0222BCE5658005E863C /* BrokenSiteInfoTabExtension.swift in Sources */,

DuckDuckGo/Assets.xcassets/Colors/InfoHoverButton.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "0.090",
+ "blue" : "0x00",
+ "green" : "0x00",
+ "red" : "0x00"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "0.090",
+ "blue" : "0xFF",
+ "green" : "0xFF",
+ "red" : "0xFF"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

DuckDuckGo/Assets.xcassets/Colors/InfoHoverButtonHovered.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "0.180",
+ "blue" : "0x00",
+ "green" : "0x00",
+ "red" : "0x00"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "0.180",
+ "blue" : "0xFF",
+ "green" : "0xFF",
+ "red" : "0xFF"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

DuckDuckGo/Assets.xcassets/Images/Autofill/Lock-Color-16.imageset/Contents.json

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

DuckDuckGo/Assets.xcassets/Images/Autofill/Lock-Solid-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+ "images" : [
+ {
+ "filename" : "Lock-Solid-16.pdf",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
+ }
+}

DuckDuckGo/Common/Extensions/URLExtension.swift

@@ -382,6 +382,10 @@ extension URL {
  return URL(string: "https://duckduckgo.com/duckduckgo-help-pages/search-privacy/")!
  }
 
+ static var passwordManagerLearnMore: URL {
+ return URL(string: "https://duckduckgo.com/duckduckgo-help-pages/sync-and-backup/password-manager-security/")!
+ }
+
  static var searchSettings: URL {
  return URL(string: "https://duckduckgo.com/settings/")!
  }

DuckDuckGo/Common/Localizables/UserText.swift

@@ -727,6 +727,8 @@ struct UserText {
  }
 
  static let importLoginsPasswords = NSLocalizedString("import.logins.passwords", value: "Passwords", comment: "Title text for the Passwords import option")
+ static let importLoginsPasswordsExplainer = NSLocalizedString("import.logins.passwords.explainer", value: "Passwords are encrypted. Viewing them or filling out forms requires Touch ID or a password. Nobody but you can see your passwords, not even us. Find Passwords in DuckDuckGo Settings > Passwords & Autofill.", comment: "Explanatory text for the Passwords import option to alleviate security concerns and explain usage.")
+ static let importLoginsPasswordsExplainerAutolockOff = NSLocalizedString("import.logins.passwords.explainer.autolock.off", value: "Passwords are encrypted. We recommend setting up Auto-lock to keep your passwords even more secure. Set it up in DuckDuckGo Settings > Passwords & Autofill.", comment: "Explanatory text for the Passwords import option to alleviate security concerns and explain usage when autolock is disabled")
 
  static let importBookmarksButtonTitle = NSLocalizedString("bookmarks.import.button.title", value: "Import", comment: "Button text to open bookmark import dialog")
  static let initiateImport = NSLocalizedString("import.data.initiate", value: "Import", comment: "Button text for importing data")

DuckDuckGo/DataImport/Model/DataImportViewModel.swift

@@ -133,11 +133,14 @@ struct DataImportViewModel {
 
 #endif
 
+ let isPasswordManagerAutolockEnabled: Bool
+
  init(importSource: Source? = nil,
  screen: Screen? = nil,
  availableImportSources: [DataImport.Source] = Source.allCases.filter { $0.canImportData },
  preferredImportSources: [Source] = [.chrome, .firefox, .safari],
  summary: [DataTypeImportResult] = [],
+ isPasswordManagerAutolockEnabled: Bool = AutofillPreferences().isAutoLockEnabled,
  loadProfiles: @escaping (ThirdPartyBrowser) -> BrowserProfileList = { $0.browserProfiles() },
  dataImporterFactory: @escaping DataImporterFactory = dataImporter,
  requestPrimaryPasswordCallback: @escaping @MainActor (Source) -> String? = Self.requestPrimaryPasswordCallback,
@@ -161,6 +164,7 @@ struct DataImportViewModel {
  self.selectedDataTypes = importSource.supportedDataTypes
 
  self.summary = summary
+ self.isPasswordManagerAutolockEnabled = isPasswordManagerAutolockEnabled
 
  self.requestPrimaryPasswordCallback = requestPrimaryPasswordCallback
  self.openPanelCallback = openPanelCallback
@@ -683,7 +687,7 @@ extension DataImportViewModel {
  }
 
  mutating func update(with importSource: Source) {
- self = .init(importSource: importSource, loadProfiles: loadProfiles, dataImporterFactory: dataImporterFactory, requestPrimaryPasswordCallback: requestPrimaryPasswordCallback, reportSenderFactory: reportSenderFactory, onFinished: onFinished, onCancelled: onCancelled)
+ self = .init(importSource: importSource, isPasswordManagerAutolockEnabled: isPasswordManagerAutolockEnabled, loadProfiles: loadProfiles, dataImporterFactory: dataImporterFactory, requestPrimaryPasswordCallback: requestPrimaryPasswordCallback, reportSenderFactory: reportSenderFactory, onFinished: onFinished, onCancelled: onCancelled)
  }
 
  @MainActor

DuckDuckGo/DataImport/View/DataImportView.swift

@@ -119,7 +119,7 @@ struct DataImportView: ModalView {
  DataImportTypePicker(viewModel: $model)
  .disabled(model.isImportSourcePickerDisabled)
 
- importPasswordSubtitle()
+ passwordsExplainerView().padding(.top, 20)
 
  case .moreInfo:
  // you will be asked for your keychain password blah blah...
@@ -159,7 +159,7 @@ struct DataImportView: ModalView {
  }
 
  if dataType == .passwords {
- importPasswordSubtitle()
+ passwordsExplainerView().padding(.top, 20)
  }
 
  case .summary(let dataTypes, let isFileImport):
@@ -208,11 +208,18 @@ struct DataImportView: ModalView {
  }
  }
 
- private func importPasswordSubtitle() -> some View {
- Text(UserText.importDataSubtitle)
- .font(.subheadline)
- .foregroundColor(Color(.greyText))
- .padding(.top, 16)
+ private func passwordsExplainerView() -> some View {
+ HStack(alignment: .top, spacing: 8) {
+ Image(.lockColor16)
+ Text(model.isPasswordManagerAutolockEnabled ? UserText.importLoginsPasswordsExplainer : UserText.importLoginsPasswordsExplainerAutolockOff)
+ .font(.system(size: 12))
+ .foregroundColor(.secondary)
+ .frame(maxWidth: .infinity, alignment: .topLeading)
+ }
+ .frame(idealWidth: .infinity, maxWidth: .infinity, alignment: .topLeading)
+ .padding(14)
+ .background(Color.blackWhite1)
+ .roundedBorder()
  }
 
  private func handleImportProgress(_ progress: TaskProgress<DataImportViewModel, Never, DataImportProgressEvent>) async {