Point to BSK branch and adapt code

duckduckgo · May 23, 2024 · e99fdb7 · e99fdb7
1 parent d96ee2a
commit e99fdb7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9853,8 +9853,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 145.3.3;
+				branch = "graeme/sanitize-location-selection";
+				kind = branch;
 			};
 		};
 		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" : "a49bbac8aa58033981a5a946d220886366dd471b",
-        "version" : "145.3.3"
+        "branch" : "graeme/sanitize-location-selection",
+        "revision" : "63daeee8c09fa851052c0430a1ccf189d02a365c"
       }
     },
     {

diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
@@ -140,7 +140,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
     // MARK: - Error Reporting
 
     // swiftlint:disable:next cyclomatic_complexity function_body_length
-    private static func networkProtectionDebugEvents(controllerErrorStore: NetworkProtectionTunnelErrorStore) -> EventMapping<NetworkProtectionError>? {
+    private static func networkProtectionDebugEvents(controllerErrorStore: NetworkProtectionTunnelErrorStore) -> EventMapping<NetworkProtectionError> {
         return EventMapping { event, _, _, _ in
             let pixelEvent: Pixel.Event
             var pixelError: Error?
@@ -277,6 +277,12 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
             defaults: .networkProtectionGroupDefaults,
             wrappee: notificationsPresenter
         )
+        let locationListRepo = NetworkProtectionLocationListCompositeRepository(
+            environment: settings.selectedEnvironment,
+            tokenStore: tokenStore,
+            errorEvents: Self.networkProtectionDebugEvents(controllerErrorStore: errorStore),
+            isSubscriptionEnabled: isSubscriptionEnabled
+        )
         notificationsPresenter.requestAuthorization()
         super.init(notificationsPresenter: notificationsPresenterDecorator,
                    tunnelHealthStore: NetworkProtectionTunnelHealthStore(),