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

UI: When setting on-demand, avoid a second saveToPreferences() call 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2021-08-03 16:33:59 +05:30
parent 55c587b443
commit ca70fe9ddc
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/WireGuardApp/Tunnel/TunnelsManager.swift
View File

@ -350,6 +350,7 @@ class TunnelsManager {
} }
let isActivatingOnDemand = !tunnelProviderManager.isOnDemandEnabled && isOnDemandEnabled let isActivatingOnDemand = !tunnelProviderManager.isOnDemandEnabled && isOnDemandEnabled
tunnelProviderManager.isOnDemandEnabled = isOnDemandEnabled tunnelProviderManager.isOnDemandEnabled = isOnDemandEnabled
tunnelProviderManager.isEnabled = true
tunnelProviderManager.saveToPreferences { error in tunnelProviderManager.saveToPreferences { error in
if let error = error { if let error = error {
wg_log(.error, message: "Modify On-Demand: Saving configuration failed: \(error)") wg_log(.error, message: "Modify On-Demand: Saving configuration failed: \(error)")
@ -367,20 +368,7 @@ class TunnelsManager {
completionHandler(TunnelsManagerError.systemErrorOnModifyTunnel(systemError: error)) completionHandler(TunnelsManagerError.systemErrorOnModifyTunnel(systemError: error))
return return
} }
if !tunnelProviderManager.isEnabled { completionHandler(nil)
// In case the tunnel has gotten disabled, re-enable and save it.
wg_log(.debug, staticMessage: "Modify On-Demand: Tunnel is disabled. Re-enabling and saving")
tunnelProviderManager.isEnabled = true
tunnelProviderManager.saveToPreferences { error in
if let error = error {
wg_log(.error, message: "Modify On-Demand: Error saving tunnel after re-enabling: \(error)")
completionHandler(TunnelsManagerError.systemErrorOnModifyTunnel(systemError: error))
return
}
}
} else {
completionHandler(nil)
}
} }
} else { } else {
completionHandler(nil) completionHandler(nil)