diff options
| author |   Roopesh Chander <roop@roopc.net> | 2018-12-08 00:54:58 +0530 |
|---|---|---|
| committer | Roopesh Chander <roop@roopc.net> | 2018-12-08 02:17:23 +0530 |
| commit | 06a783f50afcd2015c232906a320ca7edd04bbc2 (patch) | |
| tree | b6a9b57df49f0682e71eea20f702126592983f16 /WireGuard/WireGuard | |
| parent | On-Demand: Move detail text to TunnelViewModel (diff) | |
| download | wireguard-apple-06a783f50afcd2015c232906a320ca7edd04bbc2.tar.xz wireguard-apple-06a783f50afcd2015c232906a320ca7edd04bbc2.zip | |
On-Demand: TunnelViewModel: Make activate-on-demand methods static
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
| -rw-r--r-- | WireGuard/WireGuard/UI/TunnelViewModel.swift | 4 | ||||
| -rw-r--r-- | WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift index 2a3f36b..de14ad5 100644 --- a/WireGuard/WireGuard/UI/TunnelViewModel.swift +++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift @@ -451,7 +451,7 @@ class TunnelViewModel { // MARK: Activate on demand extension TunnelViewModel { - func activateOnDemandOptionText(for activateOnDemandOption: ActivateOnDemandOption) -> String { + static func activateOnDemandOptionText(for activateOnDemandOption: ActivateOnDemandOption) -> String { switch (activateOnDemandOption) { case .none: return "Off" @@ -476,7 +476,7 @@ extension TunnelViewModel { } } - func defaultActivateOnDemandOption() -> ActivateOnDemandOption { + static func defaultActivateOnDemandOption() -> ActivateOnDemandOption { return .useOnDemandOverWiFiOrCellular } diff --git a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift index c110d73..6b737fe 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift @@ -389,7 +389,7 @@ extension TunnelEditTableViewController { if (isOn) { s.activateOnDemandSetting.isActivateOnDemandEnabled = true if (s.activateOnDemandSetting.activateOnDemandOption == .none) { - s.activateOnDemandSetting.activateOnDemandOption = s.tunnelViewModel.defaultActivateOnDemandOption() + s.activateOnDemandSetting.activateOnDemandOption = TunnelViewModel.defaultActivateOnDemandOption() } s.tableView.insertRows(at: indexPaths, with: .automatic) } else { @@ -404,7 +404,7 @@ extension TunnelEditTableViewController { let rowOption = activateOnDemandOptions[row - 1] let selectedOption = activateOnDemandSetting.activateOnDemandOption assert(selectedOption != .none) - cell.message = tunnelViewModel.activateOnDemandOptionText(for: rowOption) + cell.message = TunnelViewModel.activateOnDemandOptionText(for: rowOption) cell.isChecked = (selectedOption == rowOption) return cell } |