Show last NetP disconnect error in Debug view (#2390)

duckduckgo · Jan 26, 2024 · eb90ec6 · eb90ec6
1 parent 4c64dfe
commit eb90ec6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/DuckDuckGo/Feedback/VPNMetadataCollector.swift b/DuckDuckGo/Feedback/VPNMetadataCollector.swift
@@ -195,7 +195,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
                      connectedServerIP: connectedServerIP)
     }
 
-    private func lastDisconnectError() async -> String {
+    public func lastDisconnectError() async -> String {
         if #available(iOS 16, *) {
             guard let tunnelManager = try? await NETunnelProviderManager.loadAllFromPreferences().first else {
                 return "none"

diff --git a/DuckDuckGo/NetworkProtectionDebugViewController.swift b/DuckDuckGo/NetworkProtectionDebugViewController.swift
@@ -43,6 +43,7 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         Sections.registrationKey: "Registration Key",
         Sections.notifications: "Notifications",
         Sections.networkPath: "Network Path",
+        Sections.lastDisconnectError: "Last Disconnect Error",
         Sections.connectionTest: "Connection Test",
         Sections.vpnConfiguration: "VPN Configuration"
 
@@ -56,6 +57,7 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case notifications
         case connectionTest
         case networkPath
+        case lastDisconnectError
         case vpnConfiguration
     }
 
@@ -90,6 +92,10 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case networkPath
     }
 
+    enum LastDisconnectErrorRows: Int, CaseIterable {
+        case lastDisconnectError
+    }
+
     enum ConnectionTestRows: Int, CaseIterable {
         case runConnectionTest
     }
@@ -106,6 +112,7 @@ final class NetworkProtectionDebugViewController: UITableViewController {
     private let pathMonitor = NWPathMonitor()
 
     private var currentNetworkPath: String?
+    private var lastDisconnectError: String?
     private var baseConfigurationData: String?
     private var fullProtocolConfigurationData: String?
 
@@ -138,6 +145,7 @@ final class NetworkProtectionDebugViewController: UITableViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        loadLastDisconnectError()
         loadConfigurationData()
         startPathMonitor()
     }
@@ -188,6 +196,9 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case .networkPath:
             configure(cell, forNetworkPathRow: indexPath.row)
 
+        case .lastDisconnectError:
+            configure(cell, forLastDisconnectErrorRow: indexPath.row)
+
         case .connectionTest:
             configure(cell, forConnectionTestRow: indexPath.row)
 
@@ -209,6 +220,7 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case .registrationKey: return RegistrationKeyRows.allCases.count
         case .notifications: return NotificationsRows.allCases.count
         case .networkPath: return NetworkPathRows.allCases.count
+        case .lastDisconnectError: return LastDisconnectErrorRows.allCases.count
         case .connectionTest: return ConnectionTestRows.allCases.count + connectionTestResults.count
         case .vpnConfiguration: return ConfigurationRows.allCases.count
         case .none: return 0
@@ -235,6 +247,8 @@ final class NetworkProtectionDebugViewController: UITableViewController {
             didSelectTestNotificationAction(at: indexPath)
         case .networkPath:
             break
+        case .lastDisconnectError:
+            break
         case .connectionTest:
             if indexPath.row == connectionTestResults.count {
                 Task {
@@ -394,6 +408,20 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         pathMonitor.start(queue: .main)
     }
 
+    // MARK: Last disconnect error
+
+    private func configure(_ cell: UITableViewCell, forLastDisconnectErrorRow row: Int) {
+        cell.textLabel?.font = .monospacedSystemFont(ofSize: 13.0, weight: .regular)
+        cell.textLabel?.text = lastDisconnectError ?? "Loading Last Disconnect Error..."
+    }
+
+    private func loadLastDisconnectError() {
+        Task { @MainActor in
+            lastDisconnectError = await DefaultVPNMetadataCollector().lastDisconnectError()
+            tableView.reloadData()
+        }
+    }
+
     // MARK: Connection Test
 
     private func configure(_ cell: UITableViewCell, forConnectionTestRow row: Int) {

diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings
@@ -2067,18 +2067,6 @@ But if you *do* want a peek under the hood, you can find more information about
 /* Subscription Expiration Data */
 "subscription.subscription.active.caption" = "Your Privacy Pro subscription renews on %@";
 
-/* Cancel action for the existing subscription dialog */
-"subscription.subscription.found.cancel" = "Cancel";
-
-/* Restore action for the existing subscription dialog */
-"subscription.subscription.found.restore" = "Restore";
-
-/* Message for the existing subscription dialog */
-"subscription.subscription.found.text" = "We found a subscription associated with this Apple ID.";
-
-/* Title for the existing subscription dialog */
-"subscription.subscription.found.title" = "Subscription Found";
-
 /* Message confirming that recovery code was copied to clipboard */
 "sync.code.copied" = "Recovery code copied to clipboard";