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

UI: Keep on-demand rules even if on-demand is disabled 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2021-07-28 02:10:45 +05:30
parent 1e9e21bacf
commit abaf1f1454
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/WireGuardApp/Tunnel/ActivateOnDemandOption.swift
View File

@ -46,7 +46,7 @@ extension ActivateOnDemandOption {
} }
init(from tunnelProviderManager: NETunnelProviderManager) { init(from tunnelProviderManager: NETunnelProviderManager) {
if tunnelProviderManager.isOnDemandEnabled, let onDemandRules = tunnelProviderManager.onDemandRules { if let onDemandRules = tunnelProviderManager.onDemandRules {
self = ActivateOnDemandOption.create(from: onDemandRules) self = ActivateOnDemandOption.create(from: onDemandRules)
} else { } else {
self = .off self = .off

2
Sources/WireGuardApp/UI/ActivateOnDemandViewModel.swift
View File

@ -51,7 +51,6 @@ class ActivateOnDemandViewModel {
extension ActivateOnDemandViewModel { extension ActivateOnDemandViewModel {
convenience init(tunnel: TunnelContainer) { convenience init(tunnel: TunnelContainer) {
self.init() self.init()
if tunnel.isActivateOnDemandEnabled {
switch tunnel.onDemandOption { switch tunnel.onDemandOption {
case .off: case .off:
break break
@ -66,7 +65,6 @@ extension ActivateOnDemandViewModel {
(ssidOption, selectedSSIDs) = ssidViewModel(from: onDemandSSIDOption) (ssidOption, selectedSSIDs) = ssidViewModel(from: onDemandSSIDOption)
} }
} }
}
func toOnDemandOption() -> ActivateOnDemandOption { func toOnDemandOption() -> ActivateOnDemandOption {
switch (isWiFiInterfaceEnabled, isNonWiFiInterfaceEnabled) { switch (isWiFiInterfaceEnabled, isNonWiFiInterfaceEnabled) {