diff options
author | Eric Kuck <eric@bluelinelabs.com> | 2018-12-12 12:28:27 -0600 |
---|---|---|
committer | Eric Kuck <eric@bluelinelabs.com> | 2018-12-12 12:28:27 -0600 |
commit | d06cff2a360839c67ce42a695f01bb933ba820c0 (patch) | |
tree | 3aa166de8c75947345b9bfb8398ee8b7c6b581c7 /WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift | |
parent | Added swiftlint and fixed all errors (and a bunch, but not all, warnings) (diff) | |
download | wireguard-apple-d06cff2a360839c67ce42a695f01bb933ba820c0.tar.xz wireguard-apple-d06cff2a360839c67ce42a695f01bb933ba820c0.zip |
Tons more swiftlint warnings fixed. Still a few remaining.
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to '')
-rw-r--r-- | WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift b/WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift index 10a9c0b..0aeda6f 100644 --- a/WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift +++ b/WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift @@ -21,7 +21,7 @@ extension ActivateOnDemandSetting { let rules: [NEOnDemandRule]? let connectRule = NEOnDemandRuleConnect() let disconnectRule = NEOnDemandRuleDisconnect() - switch (activateOnDemandOption) { + switch activateOnDemandOption { case .none: rules = nil case .useOnDemandOverWiFiOrCellular: @@ -41,7 +41,7 @@ extension ActivateOnDemandSetting { init(from tunnelProviderManager: NETunnelProviderManager) { let rules = tunnelProviderManager.onDemandRules ?? [] let activateOnDemandOption: ActivateOnDemandOption - switch (rules.count) { + switch rules.count { case 0: activateOnDemandOption = .none case 1: @@ -51,9 +51,9 @@ extension ActivateOnDemandSetting { case 2: let connectRule = rules.first(where: { $0.action == .connect })! let disconnectRule = rules.first(where: { $0.action == .disconnect })! - if (connectRule.interfaceTypeMatch == .wiFi && disconnectRule.interfaceTypeMatch == .cellular) { + if connectRule.interfaceTypeMatch == .wiFi && disconnectRule.interfaceTypeMatch == .cellular { activateOnDemandOption = .useOnDemandOverWiFiOnly - } else if (connectRule.interfaceTypeMatch == .cellular && disconnectRule.interfaceTypeMatch == .wiFi) { + } else if connectRule.interfaceTypeMatch == .cellular && disconnectRule.interfaceTypeMatch == .wiFi { activateOnDemandOption = .useOnDemandOverCellularOnly } else { fatalError("Unexpected onDemandRules set on tunnel provider manager") @@ -62,7 +62,7 @@ extension ActivateOnDemandSetting { fatalError("Unexpected number of onDemandRules set on tunnel provider manager") } self.activateOnDemandOption = activateOnDemandOption - if (activateOnDemandOption == .none) { + if activateOnDemandOption == .none { self.isActivateOnDemandEnabled = false } else { self.isActivateOnDemandEnabled = tunnelProviderManager.isOnDemandEnabled |