diff options
Diffstat (limited to 'WireGuard/WireGuard')
4 files changed, 22 insertions, 22 deletions
diff --git a/WireGuard/WireGuard/Tunnel/NEVPNStatus+CustomStringConvertible.swift b/WireGuard/WireGuard/Tunnel/NEVPNStatus+CustomStringConvertible.swift new file mode 100644 index 0000000..0668b8a --- /dev/null +++ b/WireGuard/WireGuard/Tunnel/NEVPNStatus+CustomStringConvertible.swift @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: MIT +// Copyright © 2018 WireGuard LLC. All Rights Reserved. + +import Foundation +import NetworkExtension + +extension NEVPNStatus: CustomDebugStringConvertible { + public var debugDescription: String { + switch self { + case .connected: return "connected" + case .connecting: return "connecting" + case .disconnected: return "disconnected" + case .disconnecting: return "disconnecting" + case .reasserting: return "reasserting" + case .invalid: return "invalid" + } + } +} diff --git a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift index ff8c720..2785be4 100644 --- a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift +++ b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift @@ -79,7 +79,6 @@ enum TunnelsManagerError: WireGuardAppError { } class TunnelsManager { - private var tunnels: [TunnelContainer] weak var tunnelsListDelegate: TunnelsManagerListDelegate? weak var activationDelegate: TunnelsManagerActivationDelegate? @@ -166,9 +165,9 @@ class TunnelsManager { } let tunnelProviderManager = tunnel.tunnelProvider - let isNameChanged = (tunnelName != tunnelProviderManager.localizedDescription) + let isNameChanged = tunnelName != tunnelProviderManager.localizedDescription if isNameChanged { - if tunnels.contains(where: { $0.name == tunnelName }) { + guard !tunnels.contains(where: { $0.name == tunnelName }) else { completionHandler(TunnelsManagerError.tunnelAlreadyExistsWithThatName) return } @@ -178,7 +177,7 @@ class TunnelsManager { tunnelProviderManager.localizedDescription = tunnelName tunnelProviderManager.isEnabled = true - let isActivatingOnDemand = (!tunnelProviderManager.isOnDemandEnabled && activateOnDemandSetting.isActivateOnDemandEnabled) + let isActivatingOnDemand = !tunnelProviderManager.isOnDemandEnabled && activateOnDemandSetting.isActivateOnDemandEnabled activateOnDemandSetting.apply(on: tunnelProviderManager) tunnelProviderManager.saveToPreferences { [weak self] error in @@ -187,7 +186,6 @@ class TunnelsManager { completionHandler(TunnelsManagerError.systemErrorOnModifyTunnel) return } - guard let self = self else { return } if isNameChanged { @@ -439,8 +437,7 @@ class TunnelContainer: NSObject { } wg_log(.debug, staticMessage: "startActivation: Tunnel saved after re-enabling") wg_log(.debug, staticMessage: "startActivation: Invoking startActivation") - self.startActivation(recursionCount: recursionCount + 1, lastError: NEVPNError(NEVPNError.configurationUnknown), - activationDelegate: activationDelegate) + self.startActivation(recursionCount: recursionCount + 1, lastError: NEVPNError(NEVPNError.configurationUnknown), activationDelegate: activationDelegate) } return } @@ -488,16 +485,3 @@ class TunnelContainer: NSObject { (tunnelProvider.connection as? NETunnelProviderSession)?.stopTunnel() } } - -extension NEVPNStatus: CustomDebugStringConvertible { - public var debugDescription: String { - switch self { - case .connected: return "connected" - case .connecting: return "connecting" - case .disconnected: return "disconnected" - case .disconnecting: return "disconnecting" - case .reasserting: return "reasserting" - case .invalid: return "invalid" - } - } -} diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift index 82e6f81..1e480b9 100644 --- a/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift @@ -24,7 +24,6 @@ class MainViewController: UISplitViewController { viewControllers = [ masterNC, detailNC ] - // State restoration restorationIdentifier = "MainVC" masterNC.restorationIdentifier = "MasterNC" detailNC.restorationIdentifier = "DetailNC" diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift index 0188c62..0596139 100644 --- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift @@ -89,7 +89,6 @@ class TunnelsListTableViewController: UIViewController { } override func viewWillAppear(_: Bool) { - // Remove selection when getting back to the list view on iPhone if let selectedRowIndexPath = tableView.indexPathForSelectedRow { tableView.deselectRow(at: selectedRowIndexPath, animated: false) } |