APPLE: fix logout disconnect not working (#1734)

nymtech · Dec 6, 2024 · f58ad74 · f58ad74
1 parent 77177f7
commit f58ad74
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/nym-vpn-apple/Services/Sources/Services/ConnectionManager/ConnectionManager.swift b/nym-vpn-apple/Services/Sources/Services/ConnectionManager/ConnectionManager.swift
@@ -50,7 +50,7 @@ public final class ConnectionManager: ObservableObject {
         }
     }
 #endif
-    @Published public var currentTunnelStatus: TunnelStatus? {
+    @Published public var currentTunnelStatus: TunnelStatus = .disconnected {
         didSet {
             updateTunnelStatusIfReconnecting()
             updateTunnelStatusIfDisconnecting()
@@ -190,16 +190,18 @@ public final class ConnectionManager: ObservableObject {
         }
     }
 #endif
-
+
+    /// Disconnects tunnel if connected.
+    /// iOS removes tunnel profile.
     public func disconnectBeforeLogout() async {
+        guard currentTunnelStatus != .disconnected else { return }
 #if os(iOS)
         disconnectActiveTunnel()
-        await waitForTunnelStatus(with: .disconnected)
         resetVpnProfile()
 #elseif os(macOS)
         grpcManager.disconnect()
-        await waitForTunnelStatus(with: .disconnected)
 #endif
+        await waitForTunnelStatus(with: .disconnected)
     }
 }
 

diff --git a/nym-vpn-apple/Services/Sources/Services/CredentialsManager/CredentialsManager.swift b/nym-vpn-apple/Services/Sources/Services/CredentialsManager/CredentialsManager.swift
@@ -65,7 +65,6 @@ public final class CredentialsManager {
 #if os(iOS)
             let dataFolderURL = try dataFolderURL()
             try forgetAccount(path: dataFolderURL.path())
-            // TODO: remove tunnel
 #endif
 
 #if os(macOS)

diff --git a/nym-vpn-apple/ServicesMutual/Sources/AppVersionProvider/AppVersionProvider.swift b/nym-vpn-apple/ServicesMutual/Sources/AppVersionProvider/AppVersionProvider.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public enum AppVersionProvider {
-    public static let libVersion = "1.1.0-dev-1"
+    public static let libVersion = "1.1.0-dev"
 
     public static var app: String {
         "nym-vpn-app"