passepartoutvpn/wireguard-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/wireguard-apple.git synced 2025-02-16 12:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: TunnelsManager: Add TunnelContainer.hasOnDemandRules

Browse Source 
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2021-07-24 23:53:31 +05:30
parent 13b720442d
commit 40f18de4d2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,6 +498,7 @@ class TunnelContainer: NSObject {
@objc dynamic var status: TunnelStatus @objc dynamic var status: TunnelStatus
@objc dynamic var isActivateOnDemandEnabled: Bool @objc dynamic var isActivateOnDemandEnabled: Bool
@objc dynamic var hasOnDemandRules: Bool
var isAttemptingActivation = false { var isAttemptingActivation = false {
didSet { didSet {
@ -524,7 +525,12 @@ class TunnelContainer: NSObject {
var activationTimer: Timer? var activationTimer: Timer?
var deactivationTimer: Timer? var deactivationTimer: Timer?
fileprivate var tunnelProvider: NETunnelProviderManager fileprivate var tunnelProvider: NETunnelProviderManager {
didSet {
isActivateOnDemandEnabled = tunnelProvider.isOnDemandEnabled
hasOnDemandRules = !(tunnelProvider.onDemandRules ?? []).isEmpty
}
}
var tunnelConfiguration: TunnelConfiguration? { var tunnelConfiguration: TunnelConfiguration? {
return tunnelProvider.tunnelConfiguration return tunnelProvider.tunnelConfiguration
@ -545,6 +551,7 @@ class TunnelContainer: NSObject {
let status = TunnelStatus(from: tunnel.connection.status) let status = TunnelStatus(from: tunnel.connection.status)
self.status = status self.status = status
isActivateOnDemandEnabled = tunnel.isOnDemandEnabled isActivateOnDemandEnabled = tunnel.isOnDemandEnabled
hasOnDemandRules = !(tunnel.onDemandRules ?? []).isEmpty
tunnelProvider = tunnel tunnelProvider = tunnel
super.init() super.init()
} }
@ -571,7 +578,6 @@ class TunnelContainer: NSObject {
return return
} }
status = TunnelStatus(from: tunnelProvider.connection.status) status = TunnelStatus(from: tunnelProvider.connection.status)
isActivateOnDemandEnabled = tunnelProvider.isOnDemandEnabled
} }
fileprivate func startActivation(recursionCount: UInt = 0, lastError: Error? = nil, activationDelegate: TunnelsManagerActivationDelegate?) { fileprivate func startActivation(recursionCount: UInt = 0, lastError: Error? = nil, activationDelegate: TunnelsManagerActivationDelegate?) {