Add a pretty-crappy approach to showing the VPN on/off status.

This gets the ship review started, but I don’t plan for it to survive code review.
duckduckgo · May 25, 2024 · 33c7ffd · 33c7ffd
1 parent 0a58c50
commit 33c7ffd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -91,6 +91,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         subscriptionManager.accountManager
     }
     public let subscriptionManager: SubscriptionManaging
+    public let vpnTunnelIPCClient = TunnelControllerIPCClient()
     public let vpnSettings = VPNSettings(defaults: .netP)
 
     private var networkProtectionSubscriptionEventHandler: NetworkProtectionSubscriptionEventHandler?

diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -27,7 +27,9 @@ struct PreferencesSection: Hashable, Identifiable {
 
     @MainActor
     static func defaultSections(includingDuckPlayer: Bool, includingSync: Bool, includingVPN: Bool) -> [PreferencesSection] {
-        var privacyPanes: [PreferencePaneIdentifier] = [.defaultBrowser, .privateSearch, .webTrackingProtection, .cookiePopupProtection, .emailProtection]
+        let privacyPanes: [PreferencePaneIdentifier] = [
+            .defaultBrowser, .privateSearch, .webTrackingProtection, .cookiePopupProtection, .emailProtection
+        ]
 
         let regularPanes: [PreferencePaneIdentifier] = {
             var panes: [PreferencePaneIdentifier] = [.general, .appearance, .autofill, .accessibility, .dataClearing]

diff --git a/DuckDuckGo/Preferences/Model/PrivacyProtectionStatus.swift b/DuckDuckGo/Preferences/Model/PrivacyProtectionStatus.swift
@@ -44,6 +44,26 @@ final class PrivacyProtectionStatus: ObservableObject {
             return PrivacyProtectionStatus(statusPublisher: publisher, initialValue: EmailManager().isSignedIn ? .on : .off) { _ in
                 EmailManager().isSignedIn ? .on : .off
             }
+        case .vpn:
+            let recentConnectionStatus = Application.appDelegate.vpnTunnelIPCClient.connectionStatusObserver.recentValue
+            let initialValue: Bool
+
+            if case .connected = recentConnectionStatus {
+                initialValue = true
+            } else {
+                initialValue = false
+            }
+
+            return PrivacyProtectionStatus(
+                statusPublisher: Application.appDelegate.vpnTunnelIPCClient.connectionStatusObserver.publisher.receive(on: RunLoop.main),
+                initialValue: initialValue ? .on : .off
+            ) { newStatus in
+                if case .connected = newStatus {
+                    return .on
+                } else {
+                    return .off
+                }
+            }
         default:
             return PrivacyProtectionStatus()
         }