fix: issue of modification on active tunnel

Signed-off-by: George Kutsurua <[email protected]>
WireGuard · Dec 7, 2021 · d08ee36 · d08ee36
1 parent 23618f9
commit d08ee36
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift
@@ -89,11 +89,13 @@ class TunnelsManager {
             guard let self = self else { return }
 
             let loadedTunnelProviders = managers ?? []
+            var removedTunnels: [TunnelContainer] = []
 
             for (index, currentTunnel) in self.tunnels.enumerated().reversed() {
                 if !loadedTunnelProviders.contains(where: { $0.isEquivalentTo(currentTunnel) }) {
                     // Tunnel was deleted outside the app
                     self.tunnels.remove(at: index)
+                    removedTunnels.append(currentTunnel)
                     self.tunnelsListDelegate?.tunnelRemoved(at: index, tunnel: currentTunnel)
                 }
             }
@@ -109,6 +111,10 @@ class TunnelsManager {
                         }
                     }
                     let tunnel = TunnelContainer(tunnel: loadedTunnelProvider)
+                    // Removed tunnel contains programmatically changed status, so we copying it to new one
+                    if let removedTunnel = removedTunnels.first(where: { $0.name == tunnel.name }), [TunnelStatus.restarting, TunnelStatus.reasserting, TunnelStatus.waiting].contains(removedTunnel.status) {
+                        tunnel.status = removedTunnel.status
+                    }
                     self.tunnels.append(tunnel)
                     self.tunnels.sort { TunnelsManager.tunnelNameIsLessThan($0.name, $1.name) }
                     self.tunnelsListDelegate?.tunnelAdded(at: self.tunnels.firstIndex(of: tunnel)!)