Hotfix/7.149.1

AutofillCredentialProvider/CredentialProvider/CredentialProviderViewController.swift

@@ -22,6 +22,7 @@ import SwiftUI
 import BrowserServicesKit
 import Core
 import Common
+import os.log
 
 class CredentialProviderViewController: ASCredentialProviderViewController {
 
@@ -110,7 +111,9 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
         installChildViewController(hostingController)
 
         Task {
-            await credentialIdentityStoreManager.populateCredentialStore()
+            if findKeychainItemsWithV4() {
+                await credentialIdentityStoreManager.populateCredentialStore()
+            }
         }
 
         Pixel.fire(pixel: .autofillExtensionEnabled)
@@ -203,4 +206,31 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
             }
         }
     }
+
+    private func findKeychainItemsWithV4() -> Bool {
+        var itemsWithV4: [String] = []
+
+        let query: [String: Any] = [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecReturnAttributes as String: kCFBooleanTrue!,
+            kSecMatchLimit as String: kSecMatchLimitAll
+        ]
+
+        var result: AnyObject?
+
+        let status = SecItemCopyMatching(query as CFDictionary, &result)
+
+        if status == errSecSuccess, let items = result as? [[String: Any]] {
+            for item in items {
+                if let service = item[kSecAttrService as String] as? String,
+                   service.contains("v4") {
+                    itemsWithV4.append(service)
+                }
+            }
+        } else {
+            Logger.autofill.debug("No items found or error: \(status)")
+        }
+
+        return !itemsWithV4.isEmpty
+    }
 }

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AutofillCredentialProvider.xcscheme

@@ -46,7 +46,7 @@
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Alpha Debug"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"

DuckDuckGo/AutofillUsageMonitor.swift

@@ -19,19 +19,34 @@
 
 import Core
 import AuthenticationServices
+import BrowserServicesKit
 
 final class AutofillUsageMonitor {
 
+    private lazy var credentialIdentityStoreManager: AutofillCredentialIdentityStoreManager? = {
+        guard let vault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter()) else {
+            return nil
+        }
+
+        return AutofillCredentialIdentityStoreManager(vault: vault,
+                                                      tld: AppDependencyProvider.shared.storageCache.tld)
+    }()
+
     init() {
         NotificationCenter.default.addObserver(self, selector: #selector(didReceiveSaveEvent), name: .autofillSaveEvent, object: nil)
 
-        ASCredentialIdentityStore.shared.getState({ state in
+        ASCredentialIdentityStore.shared.getState({ [weak self] state in
             if state.isEnabled {
-                self.autofillExtensionEnabled = true
+                if self?.autofillExtensionEnabled == nil {
+                    Task {
+                        await self?.credentialIdentityStoreManager?.populateCredentialStore()
+                    }
+                }
+                self?.autofillExtensionEnabled = true
             } else {
-                if self.autofillExtensionEnabled != nil {
+                if self?.autofillExtensionEnabled != nil {
                     Pixel.fire(pixel: .autofillExtensionDisabled)
-                    self.autofillExtensionEnabled = false
+                    self?.autofillExtensionEnabled = false
                 }
             }
         })