Stop tunnel

duckduckgo · Mar 27, 2024 · c2d7cd4 · c2d7cd4
1 parent a0304cd
commit c2d7cd4
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -499,8 +499,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 #if NETWORK_PROTECTION
         widgetRefreshModel.refreshVPNWidget()
 
-        if vpnFeatureVisibility.shouldShowThankYouMessaging() && !tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown {
-            presentVPNEarlyAccessOverAlert()
+        if vpnFeatureVisibility.shouldShowThankYouMessaging() {
+            stopTunnelAndShowThankYouMessagingIfNeeded()
         }
 
         if tunnelDefaults.showEntitlementAlert {
@@ -513,6 +513,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         updateSubscriptionStatus()
     }
 
+    private func stopTunnelAndShowThankYouMessagingIfNeeded() {
+        Task {
+            let controller = NetworkProtectionTunnelController()
+
+            if await controller.isConnected {
+                DailyPixel.fireDailyAndCount(pixel: .privacyProVPNBetaStoppedWhenPrivacyProEnabled)
+            }
+
+            await controller.stop()
+            await controller.removeVPN()
+
+            if !tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown {
+                await MainActor.run {
+                    self.presentVPNEarlyAccessOverAlert()
+                }
+            }
+        }
+    }
+
     func updateSubscriptionStatus() {
 #if SUBSCRIPTION
         Task {