VPN is sometimes stopped twice (#3928)

Task/Issue URL: https://app.asana.com/0/1207603085593419/1209322889682604/f macOS PR: duckduckgo/macos-browser#3829 BSK PR: duckduckgo/BrowserServicesKit#1213 **Description**: Fixes an issue where the tunnel is being stopped twice.
duckduckgo · Feb 7, 2025 · d8148cb · d8148cb
1 parent 9a3a08b
commit d8148cb
Show file tree

Hide file tree

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

diff --git a/DuckDuckGo-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -30,10 +30,10 @@
     {
       "identity" : "browserserviceskit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
+      "location" : "https://github.com/DuckDuckGo/BrowserServicesKit.git",
       "state" : {
-        "revision" : "1169c5565a1d6e3091e93448a28485a736dfa6d4",
-        "version" : "236.0.0"
+        "revision" : "ab64a6616c7b726a55b6c67c0da421c636db1224",
+        "version" : "236.0.1"
       }
     },
     {

diff --git a/DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift b/DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift
@@ -360,7 +360,7 @@ final class SubscriptionPagesUseSubscriptionFeatureTests: XCTestCase {
         storePurchaseManager.purchaseSubscriptionResult = .success(Constants.mostRecentTransactionJWS)
         subscriptionService.confirmPurchaseResult = .success(ConfirmPurchaseResponse(email: Constants.email,
                                                                                      entitlements: Constants.entitlements,
-                                                                                     subscription: SubscriptionMockFactory.subscription))
+                                                                                     subscription: SubscriptionMockFactory.appleSubscription))
 
         // When
         let subscriptionSelectedParams = ["id": "some-subscription-id"]
@@ -400,7 +400,7 @@ final class SubscriptionPagesUseSubscriptionFeatureTests: XCTestCase {
         storePurchaseManager.purchaseSubscriptionResult = .success(Constants.mostRecentTransactionJWS)
         subscriptionService.confirmPurchaseResult = .success(ConfirmPurchaseResponse(email: Constants.email,
                                                                                      entitlements: Constants.entitlements,
-                                                                                     subscription: SubscriptionMockFactory.subscription))
+                                                                                     subscription: SubscriptionMockFactory.appleSubscription))
 
         // When
         let subscriptionSelectedParams = ["id": "some-subscription-id"]
@@ -434,7 +434,7 @@ final class SubscriptionPagesUseSubscriptionFeatureTests: XCTestCase {
         storePurchaseManager.purchaseSubscriptionResult = .success(Constants.mostRecentTransactionJWS)
         subscriptionService.confirmPurchaseResult = .success(ConfirmPurchaseResponse(email: Constants.email,
                                                                                      entitlements: Constants.entitlements,
-                                                                                     subscription: SubscriptionMockFactory.subscription))
+                                                                                     subscription: SubscriptionMockFactory.appleSubscription))
 
         // When
         let subscriptionSelectedParams = ["id": "some-subscription-id"]
@@ -846,7 +846,7 @@ final class SubscriptionPagesUseSubscriptionFeatureTests: XCTestCase {
         }
 
         authService.validateTokenResult = .success(Constants.validateTokenResponse)
-        subscriptionService.getSubscriptionResult = .success(SubscriptionMockFactory.subscription)
+        subscriptionService.getSubscriptionResult = .success(SubscriptionMockFactory.appleSubscription)
 
         // When
         let result = await feature.backToSettings(params: Constants.mockParams, original: Constants.mockScriptMessage)
@@ -930,7 +930,7 @@ final class SubscriptionPagesUseSubscriptionFeatureTests: XCTestCase {
                                                                    id: 1, status: "authenticated"))
         authService.getAccessTokenResult = .success(AccessTokenResponse(accessToken: Constants.accessToken))
         authService.validateTokenResult = .success(Constants.validateTokenResponse)
-        subscriptionService.getSubscriptionResult = .success(SubscriptionMockFactory.subscription)
+        subscriptionService.getSubscriptionResult = .success(SubscriptionMockFactory.appleSubscription)
 
         // When
         try await feature.restoreAccountFromAppStorePurchase()