Avoid caching a PrivacyConfig instance in FeatureFlagger (#2692)

Task/Issue URL: https://app.asana.com/0/414235014887631/1206053496104935/f Tech Design URL: CC: Description: This PR updates FeatureFlagger to no longer cache a PrivacyConfig instance.
duckduckgo · Apr 8, 2024 · 93bdf47 · 93bdf47
1 parent dcbc78a
commit 93bdf47
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -10037,7 +10037,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 132.0.2;
+				version = 133.0.0;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git 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" : "5199a6964e183c3d001b188286bbabeca93c8849",
-        "version" : "132.0.2"
+        "revision" : "c0b0cb55e7ac2f69d10452e1a5c06713155d798e",
+        "version" : "133.0.0"
       }
     },
     {

diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift
@@ -54,8 +54,10 @@ class AppDependencyProvider: DependencyProvider {
     let variantManager: VariantManager = DefaultVariantManager()
 
     let internalUserDecider: InternalUserDecider = ContentBlocking.shared.privacyConfigurationManager.internalUserDecider
-    private lazy var privacyConfig: PrivacyConfiguration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
-    lazy var featureFlagger: FeatureFlagger = DefaultFeatureFlagger(internalUserDecider: internalUserDecider, privacyConfig: privacyConfig)
+    lazy var featureFlagger: FeatureFlagger = DefaultFeatureFlagger(
+        internalUserDecider: internalUserDecider,
+        privacyConfigManager: ContentBlocking.shared.privacyConfigurationManager
+    )
 
     let remoteMessagingStore: RemoteMessagingStore = RemoteMessagingStore()
     lazy var homePageConfiguration: HomePageConfiguration = HomePageConfiguration(variantManager: variantManager,

diff --git a/DuckDuckGoTests/AppUserDefaultsTests.swift b/DuckDuckGoTests/AppUserDefaultsTests.swift
@@ -201,7 +201,7 @@ class AppUserDefaultsTests: XCTestCase {
         mockManager.privacyConfig = mockConfiguration(subfeatureEnabled: enabled)
 
         let internalUserDecider = DefaultInternalUserDecider(store: internalUserDeciderStore)
-        return DefaultFeatureFlagger(internalUserDecider: internalUserDecider, privacyConfig: mockManager.privacyConfig)
+        return DefaultFeatureFlagger(internalUserDecider: internalUserDecider, privacyConfigManager: mockManager)
     }
 
     private func mockConfiguration(subfeatureEnabled: Bool) -> PrivacyConfiguration {

diff --git a/DuckDuckGoTests/NetworkProtectionAccessControllerTests.swift b/DuckDuckGoTests/NetworkProtectionAccessControllerTests.swift
@@ -162,7 +162,7 @@ final class NetworkProtectionAccessControllerTests: XCTestCase {
         mockManager.privacyConfig = mockConfiguration(subfeatureEnabled: enabled)
 
         let internalUserDecider = DefaultInternalUserDecider(store: internalUserDeciderStore)
-        return DefaultFeatureFlagger(internalUserDecider: internalUserDecider, privacyConfig: mockManager.privacyConfig)
+        return DefaultFeatureFlagger(internalUserDecider: internalUserDecider, privacyConfigManager: mockManager)
     }
 
     private func mockConfiguration(subfeatureEnabled: Bool) -> PrivacyConfiguration {