ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It's 'WiFi', not 'Wifi'

Browse Source 
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-11-28 12:41:35 +05:30
parent b946cbc0f3
commit 3e1772ccd0
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/UI/TunnelViewModel.swift
+5 -5
View File
@@ -455,17 +455,17 @@ extension TunnelViewModel {
switch (activateOnDemandOption) { switch (activateOnDemandOption) {
case .none: case .none:
return "" return ""
case .useOnDemandOverWifiOrCellular: case .useOnDemandOverWiFiOrCellular:
return "Over wifi or cellular" return "Over WiFi or cellular"
case .useOnDemandOverWifiOnly: case .useOnDemandOverWiFiOnly:
return "Over wifi only" return "Over WiFi only"
case .useOnDemandOverCellularOnly: case .useOnDemandOverCellularOnly:
return "Over cellular only" return "Over cellular only"
} }
} }
func defaultActivateOnDemandOption() -> ActivateOnDemandOption { func defaultActivateOnDemandOption() -> ActivateOnDemandOption {
return .useOnDemandOverWifiOrCellular return .useOnDemandOverWiFiOrCellular
} }
} }
WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+4 -4
View File
@@ -436,10 +436,10 @@ class TunnelDetailTableViewActivateOnDemandCell: UITableViewCell {
switch (activateOnDemandSetting.activateOnDemandOption) { switch (activateOnDemandSetting.activateOnDemandOption) {
case .none: case .none:
detailText = "Off" detailText = "Off"
case .useOnDemandOverWifiOrCellular: case .useOnDemandOverWiFiOrCellular:
detailText = "Wifi or cellular" detailText = "WiFi or cellular"
case .useOnDemandOverWifiOnly: case .useOnDemandOverWiFiOnly:
detailText = "Wifi only" detailText = "WiFi only"
case .useOnDemandOverCellularOnly: case .useOnDemandOverCellularOnly:
detailText = "Cellular only" detailText = "Cellular only"
} }
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
+2 -2
View File
@@ -27,8 +27,8 @@ class TunnelEditTableViewController: UITableViewController {
] ]
let activateOnDemandOptions: [ActivateOnDemandOption] = [ let activateOnDemandOptions: [ActivateOnDemandOption] = [
.useOnDemandOverWifiOrCellular, .useOnDemandOverWiFiOrCellular,
.useOnDemandOverWifiOnly, .useOnDemandOverWiFiOnly,
.useOnDemandOverCellularOnly .useOnDemandOverCellularOnly
] ]
WireGuard/WireGuard/VPN/ActivateOnDemandSetting.swift
+6 -6
View File
@@ -10,8 +10,8 @@ struct ActivateOnDemandSetting {
enum ActivateOnDemandOption { enum ActivateOnDemandOption {
case none // Valid only when isActivateOnDemandEnabled is false case none // Valid only when isActivateOnDemandEnabled is false
case useOnDemandOverWifiOrCellular case useOnDemandOverWiFiOrCellular
case useOnDemandOverWifiOnly case useOnDemandOverWiFiOnly
case useOnDemandOverCellularOnly case useOnDemandOverCellularOnly
} }
@@ -24,9 +24,9 @@ extension ActivateOnDemandSetting {
switch (activateOnDemandOption) { switch (activateOnDemandOption) {
case .none: case .none:
rules = nil rules = nil
case .useOnDemandOverWifiOrCellular: case .useOnDemandOverWiFiOrCellular:
rules = [connectRule] rules = [connectRule]
case .useOnDemandOverWifiOnly: case .useOnDemandOverWiFiOnly:
connectRule.interfaceTypeMatch = .wiFi connectRule.interfaceTypeMatch = .wiFi
disconnectRule.interfaceTypeMatch = .cellular disconnectRule.interfaceTypeMatch = .cellular
rules = [connectRule, disconnectRule] rules = [connectRule, disconnectRule]
@@ -47,12 +47,12 @@ extension ActivateOnDemandSetting {
case 1: case 1:
let rule = rules[0] let rule = rules[0]
precondition(rule.action == .connect) precondition(rule.action == .connect)
activateOnDemandOption = .useOnDemandOverWifiOrCellular activateOnDemandOption = .useOnDemandOverWiFiOrCellular
case 2: case 2:
let connectRule = rules.first(where: { $0.action == .connect })! let connectRule = rules.first(where: { $0.action == .connect })!
let disconnectRule = rules.first(where: { $0.action == .disconnect })! let disconnectRule = rules.first(where: { $0.action == .disconnect })!
if (connectRule.interfaceTypeMatch == .wiFi && disconnectRule.interfaceTypeMatch == .cellular) { if (connectRule.interfaceTypeMatch == .wiFi && disconnectRule.interfaceTypeMatch == .cellular) {
activateOnDemandOption = .useOnDemandOverWifiOnly activateOnDemandOption = .useOnDemandOverWiFiOnly
} else if (connectRule.interfaceTypeMatch == .cellular && disconnectRule.interfaceTypeMatch == .wiFi) { } else if (connectRule.interfaceTypeMatch == .cellular && disconnectRule.interfaceTypeMatch == .wiFi) {
activateOnDemandOption = .useOnDemandOverCellularOnly activateOnDemandOption = .useOnDemandOverCellularOnly
} else { } else {