From d271e4648a9d4765098427fe86ddc67ebe8e1587 Mon Sep 17 00:00:00 2001 From: dbajpeyi <3018923+dbajpeyi@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:56:24 +0000 Subject: [PATCH 1/6] Update BSK with autofill 16.1.0 --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 50887e402a..eee2b0824a 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -15296,8 +15296,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 221.3.0; + kind = revision; + revision = 26d7f50c9d7749be13d4ceeab8c02c92b875ca9b; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { From 62447f72702e405b5643d853575a37b89f5a55ff Mon Sep 17 00:00:00 2001 From: Anya Mallon Date: Tue, 7 Jan 2025 15:48:53 +0100 Subject: [PATCH 2/6] Pass partialFormSaves feature flag to Autofill JS --- DuckDuckGo/DBP/DBPHomeViewController.swift | 3 ++- DuckDuckGo/Tab/Model/ContentScopeFeatureFlagging.swift | 3 ++- .../DebugUI/DataBrokerRunCustomJSONViewModel.swift | 3 ++- .../Scheduler/DataBrokerProtectionAgentManager.swift | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift index 96443a61f1..5b73cd4af3 100644 --- a/DuckDuckGo/DBP/DBPHomeViewController.swift +++ b/DuckDuckGo/DBP/DBPHomeViewController.swift @@ -52,7 +52,8 @@ final class DBPHomeViewController: NSViewController { passwordGeneration: false, inlineIconCredentials: false, thirdPartyCredentialsProvider: false, - unknownUsernameCategorization: false) + unknownUsernameCategorization: false, + partialFormSaves: false) let isGPCEnabled = WebTrackingProtectionPreferences.shared.isGPCEnabled let sessionKey = UUID().uuidString diff --git a/DuckDuckGo/Tab/Model/ContentScopeFeatureFlagging.swift b/DuckDuckGo/Tab/Model/ContentScopeFeatureFlagging.swift index 09010c106e..c8ee45e224 100644 --- a/DuckDuckGo/Tab/Model/ContentScopeFeatureFlagging.swift +++ b/DuckDuckGo/Tab/Model/ContentScopeFeatureFlagging.swift @@ -32,6 +32,7 @@ extension ContentScopeFeatureToggles { passwordGeneration: autofillPrefs.askToSaveUsernamesAndPasswords, inlineIconCredentials: autofillPrefs.askToSaveUsernamesAndPasswords, thirdPartyCredentialsProvider: true, - unknownUsernameCategorization: privacyConfig.isSubfeatureEnabled(AutofillSubfeature.unknownUsernameCategorization)) + unknownUsernameCategorization: privacyConfig.isSubfeatureEnabled(AutofillSubfeature.unknownUsernameCategorization), + partialFormSaves: privacyConfig.isSubfeatureEnabled(AutofillSubfeature.partialFormSaves)) } } diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift index 117ae11d94..4530b29014 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift @@ -165,7 +165,8 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject { passwordGeneration: false, inlineIconCredentials: false, thirdPartyCredentialsProvider: false, - unknownUsernameCategorization: false) + unknownUsernameCategorization: false, + partialFormSaves: false) let sessionKey = UUID().uuidString let messageSecret = UUID().uuidString diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift index f125c7b4c5..5f6238f22d 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift @@ -58,7 +58,8 @@ public class DataBrokerProtectionAgentManagerProvider { passwordGeneration: false, inlineIconCredentials: false, thirdPartyCredentialsProvider: false, - unknownUsernameCategorization: false) + unknownUsernameCategorization: false, + partialFormSaves: false) let contentScopeProperties = ContentScopeProperties(gpcEnabled: false, sessionKey: UUID().uuidString, messageSecret: UUID().uuidString, From 5ad8c3e415bb551f9f765b1d95be55dc1f8fc4f1 Mon Sep 17 00:00:00 2001 From: Anya Mallon Date: Tue, 7 Jan 2025 15:52:15 +0100 Subject: [PATCH 3/6] Update BSK revision --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index e64facb264..83b1ece7a1 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -15342,7 +15342,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = revision; - revision = 26d7f50c9d7749be13d4ceeab8c02c92b875ca9b; + revision = 868ca8f88223bc63abf8213938195fceb991e5c1; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index abbc299c08..4130cab4d4 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "e8f94cf597f4a447f86f39f461b736ac9ea280ce", - "version" : "223.0.0" + "revision" : "868ca8f88223bc63abf8213938195fceb991e5c1" } }, { @@ -50,8 +49,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git", "state" : { - "revision" : "88982a3802ac504e2f1a118a73bfdf2d8f4a7735", - "version" : "16.0.0" + "revision" : "47c26dc32b94cdbcef3e6157497147917678c25c", + "version" : "16.1.0" } }, { From f85c1f0eac29e7cdf12c83e59fa50fff2dedfd42 Mon Sep 17 00:00:00 2001 From: Anya Mallon Date: Tue, 7 Jan 2025 17:49:59 +0100 Subject: [PATCH 4/6] Mocks update --- .../Tests/DataBrokerProtectionTests/Mocks.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift index 941f469659..40d6db23b0 100644 --- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift +++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift @@ -273,7 +273,8 @@ extension ContentScopeFeatureToggles { passwordGeneration: false, inlineIconCredentials: false, thirdPartyCredentialsProvider: false, - unknownUsernameCategorization: false + unknownUsernameCategorization: false, + partialFormSaves: false ) } } From 6247d82814916f860669fc6d938d6a0d2bff549d Mon Sep 17 00:00:00 2001 From: Anya Mallon Date: Wed, 8 Jan 2025 22:11:49 +0100 Subject: [PATCH 5/6] Bump BSK commit --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 83b1ece7a1..af289f42b8 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -15342,7 +15342,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = revision; - revision = 868ca8f88223bc63abf8213938195fceb991e5c1; + revision = 800fabc50baecea2fcceffc43dccc98be425e93f; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 04cf33d3c5..aaeff239a5 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,7 +32,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "868ca8f88223bc63abf8213938195fceb991e5c1" + "revision" : "800fabc50baecea2fcceffc43dccc98be425e93f" } }, { From 76757eda8ebd6038b674f20c0a1bfa24c0ac825b Mon Sep 17 00:00:00 2001 From: Anya Mallon Date: Wed, 8 Jan 2025 22:32:26 +0100 Subject: [PATCH 6/6] Set BSK release --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/FeatureFlags/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/NewTabPage/Package.swift | 2 +- LocalPackages/SubscriptionUI/Package.swift | 2 +- LocalPackages/WebKitExtensions/Package.swift | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index af289f42b8..90e399c7ff 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -15341,8 +15341,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = revision; - revision = 800fabc50baecea2fcceffc43dccc98be425e93f; + kind = exactVersion; + version = 224.1.0; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 665c03431e..dddcfb9977 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.1.0"), .package(path: "../SwiftUIExtensions"), .package(path: "../AppKitExtensions"), .package(path: "../XPCHelper"), diff --git a/LocalPackages/FeatureFlags/Package.swift b/LocalPackages/FeatureFlags/Package.swift index 4d641b06db..483953d3ba 100644 --- a/LocalPackages/FeatureFlags/Package.swift +++ b/LocalPackages/FeatureFlags/Package.swift @@ -32,7 +32,7 @@ let package = Package( targets: ["FeatureFlags"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.1.0"), ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index b9a0716119..5768ffc164 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -33,7 +33,7 @@ let package = Package( .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.1.0"), .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"), .package(path: "../AppLauncher"), .package(path: "../UDSHelper"), diff --git a/LocalPackages/NewTabPage/Package.swift b/LocalPackages/NewTabPage/Package.swift index 84e62cff0c..23e81b13d2 100644 --- a/LocalPackages/NewTabPage/Package.swift +++ b/LocalPackages/NewTabPage/Package.swift @@ -32,7 +32,7 @@ let package = Package( targets: ["NewTabPage"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.1.0"), .package(path: "../WebKitExtensions"), .package(path: "../Utilities"), ], diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index b9cab51efb..f90ca1903f 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -13,7 +13,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.1.0"), .package(path: "../SwiftUIExtensions"), .package(path: "../FeatureFlags") ], diff --git a/LocalPackages/WebKitExtensions/Package.swift b/LocalPackages/WebKitExtensions/Package.swift index 1ed282dae7..fc8e0f0fb8 100644 --- a/LocalPackages/WebKitExtensions/Package.swift +++ b/LocalPackages/WebKitExtensions/Package.swift @@ -32,7 +32,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "224.1.0"), .package(path: "../AppKitExtensions") ], targets: [