passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On-Demand: TunnelViewModel: Make activate-on-demand methods static 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-12-08 00:54:58 +05:30
parent 465c22f769
commit 06a783f50a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WireGuard/WireGuard/UI/TunnelViewModel.swift
View File

@ -451,7 +451,7 @@ class TunnelViewModel {
// MARK: Activate on demand // MARK: Activate on demand
extension TunnelViewModel { extension TunnelViewModel {
func activateOnDemandOptionText(for activateOnDemandOption: ActivateOnDemandOption) -> String { static func activateOnDemandOptionText(for activateOnDemandOption: ActivateOnDemandOption) -> String {
switch (activateOnDemandOption) { switch (activateOnDemandOption) {
case .none: case .none:
return "Off" return "Off"
@ -476,7 +476,7 @@ extension TunnelViewModel {
} }
} }
func defaultActivateOnDemandOption() -> ActivateOnDemandOption { static func defaultActivateOnDemandOption() -> ActivateOnDemandOption {
return .useOnDemandOverWiFiOrCellular return .useOnDemandOverWiFiOrCellular
} }

4
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
View File

@ -389,7 +389,7 @@ extension TunnelEditTableViewController {
if (isOn) { if (isOn) {
s.activateOnDemandSetting.isActivateOnDemandEnabled = true s.activateOnDemandSetting.isActivateOnDemandEnabled = true
if (s.activateOnDemandSetting.activateOnDemandOption == .none) { if (s.activateOnDemandSetting.activateOnDemandOption == .none) {
s.activateOnDemandSetting.activateOnDemandOption = s.tunnelViewModel.defaultActivateOnDemandOption() s.activateOnDemandSetting.activateOnDemandOption = TunnelViewModel.defaultActivateOnDemandOption()
} }
s.tableView.insertRows(at: indexPaths, with: .automatic) s.tableView.insertRows(at: indexPaths, with: .automatic)
} else { } else {
@ -404,7 +404,7 @@ extension TunnelEditTableViewController {
let rowOption = activateOnDemandOptions[row - 1] let rowOption = activateOnDemandOptions[row - 1]
let selectedOption = activateOnDemandSetting.activateOnDemandOption let selectedOption = activateOnDemandSetting.activateOnDemandOption
assert(selectedOption != .none) assert(selectedOption != .none)
cell.message = tunnelViewModel.activateOnDemandOptionText(for: rowOption) cell.message = TunnelViewModel.activateOnDemandOptionText(for: rowOption)
cell.isChecked = (selectedOption == rowOption) cell.isChecked = (selectedOption == rowOption)
return cell return cell
} }