From bb2a3f7b9d1efb3bd4b05559374a2e3e40bdb04e Mon Sep 17 00:00:00 2001 From: Graeme Arthur <2030310+graeme@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:52:14 +0200 Subject: [PATCH 1/2] Remove deduplication feature flag --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- .../Logins/SecureVault/SecureVaultLoginImporter.swift | 7 +------ DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift | 5 ----- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 6674a8f51e..1ef6b92397 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14237,8 +14237,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 196.2.0; + branch = "graeme/remove-deduplication-feature-flag"; + kind = branch; }; }; 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 7712351347..1e9665f32a 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "32a2ec64385543ccfbaaafbfe9545543a2c06aac", - "version" : "196.2.0" + "branch" : "graeme/remove-deduplication-feature-flag", + "revision" : "8583cd125c91bf11227b2c026188455b3d8a83d5" } }, { @@ -75,7 +75,7 @@ { "identity" : "lottie-spm", "kind" : "remoteSourceControl", - "location" : "https://github.com/airbnb/lottie-spm.git", + "location" : "https://github.com/airbnb/lottie-spm", "state" : { "revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605", "version" : "4.4.3" diff --git a/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift b/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift index 116332ce15..ab06c6a922 100644 --- a/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift +++ b/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift @@ -27,10 +27,6 @@ final class SecureVaultLoginImporter: LoginImporter { self.loginImportState = loginImportState } - static var featureFlagger: FeatureFlagger { - NSApp.delegateTyped.featureFlagger - } - private enum ImporterError: Error { case duplicate } @@ -61,8 +57,7 @@ final class SecureVaultLoginImporter: LoginImporter { } do { - if Self.featureFlagger.isFeatureOn(.deduplicateLoginsOnImport), - let signature = try vault.encryptPassword(for: credentials, key: encryptionKey, salt: hashingSalt).account.signature { + if let signature = try vault.encryptPassword(for: credentials, key: encryptionKey, salt: hashingSalt).account.signature { let isDuplicate = accounts.contains { $0.isDuplicateOf(accountToBeImported: account, signatureOfAccountToBeImported: signature, passwordToBeImported: login.password) } diff --git a/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift b/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift index d5cacaf5af..efcc312373 100644 --- a/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift +++ b/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift @@ -29,9 +29,6 @@ public enum FeatureFlag: String { /// https://app.asana.com/0/1199230911884351/1205979030848528/f case appendAtbToSerpQueries - // https://app.asana.com/0/72649045549333/1207597760316574/f - case deduplicateLoginsOnImport - // https://app.asana.com/0/1206488453854252/1207136666798700/f case freemiumPIR @@ -50,8 +47,6 @@ extension FeatureFlag: FeatureFlagSourceProviding { return .internalOnly case .sslCertificatesBypass: return .remoteReleasable(.subfeature(SslCertificatesSubfeature.allowBypass)) - case .deduplicateLoginsOnImport: - return .remoteReleasable(.subfeature(AutofillSubfeature.deduplicateLoginsOnImport)) case .unknownUsernameCategorization: return .remoteReleasable(.subfeature(AutofillSubfeature.unknownUsernameCategorization)) case .freemiumPIR: From 6d7ca9894264f86ba18b7bfc04d287e8163e3c7f Mon Sep 17 00:00:00 2001 From: Graeme Arthur <2030310+graeme@users.noreply.github.com> Date: Fri, 20 Sep 2024 18:00:35 +0200 Subject: [PATCH 2/2] Bump BSK version --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- LocalPackages/DataBrokerProtection/Package.swift | 2 +- LocalPackages/NetworkProtectionMac/Package.swift | 2 +- LocalPackages/SubscriptionUI/Package.swift | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 1ef6b92397..df26b76733 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14237,8 +14237,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - branch = "graeme/remove-deduplication-feature-flag"; - kind = branch; + kind = exactVersion; + version = 197.0.0; }; }; 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 1e9665f32a..3aa428c659 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "branch" : "graeme/remove-deduplication-feature-flag", - "revision" : "8583cd125c91bf11227b2c026188455b3d8a83d5" + "revision" : "40f2fcc23944e028e16798a784ceff7e24ba6683", + "version" : "197.0.0" } }, { diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 5797267d13..b23e4bcb09 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: "196.2.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "197.0.0"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), ], diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index 65de3f76ae..a4a7f3b3a4 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -32,7 +32,7 @@ let package = Package( .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "196.2.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "197.0.0"), .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"), .package(path: "../AppLauncher"), .package(path: "../UDSHelper"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index 662098d9b7..4819cb4d78 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "196.2.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "197.0.0"), .package(path: "../SwiftUIExtensions") ], targets: [