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

macOS: Tunnel detail: Reload runtime config every second

Browse Source
This commit is contained in:
Roopesh Chander 2019-01-31 14:43:37 +05:30
parent 558f6db3c2
commit 85e9b48f87
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
View File

@ -86,6 +86,7 @@ class TunnelDetailTableViewController: NSViewController {
private var tableViewModelRows = [TableViewModelRow]() private var tableViewModelRows = [TableViewModelRow]()
private var statusObservationToken: AnyObject? private var statusObservationToken: AnyObject?
private var tunnelEditVC: TunnelEditViewController? private var tunnelEditVC: TunnelEditViewController?
private var reloadRuntimeConfigurationTimer: Timer?
init(tunnelsManager: TunnelsManager, tunnel: TunnelContainer) { init(tunnelsManager: TunnelsManager, tunnel: TunnelContainer) {
self.tunnelsManager = tunnelsManager self.tunnelsManager = tunnelsManager
@ -97,8 +98,6 @@ class TunnelDetailTableViewController: NSViewController {
statusObservationToken = tunnel.observe(\TunnelContainer.status) { [weak self] _, _ in statusObservationToken = tunnel.observe(\TunnelContainer.status) { [weak self] _, _ in
self?.updateStatus() self?.updateStatus()
} }
// TODO(roopc): call reloadRuntimeConfiguration() once per second
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
@ -199,7 +198,11 @@ class TunnelDetailTableViewController: NSViewController {
let shouldBeEnabled = (tunnel.status == .active || tunnel.status == .inactive) let shouldBeEnabled = (tunnel.status == .active || tunnel.status == .inactive)
statusCheckbox.state = shouldBeChecked ? .on : .off statusCheckbox.state = shouldBeChecked ? .on : .off
statusCheckbox.isEnabled = shouldBeEnabled statusCheckbox.isEnabled = shouldBeEnabled
reloadRuntimeConfiguration() if tunnel.status == .active {
startUpdatingRuntimeConfiguration()
} else if tunnel.status == .inactive {
stopUpdatingRuntimeConfiguration()
}
} }
@objc func handleEditTunnelAction() { @objc func handleEditTunnelAction() {
@ -231,20 +234,35 @@ class TunnelDetailTableViewController: NSViewController {
if let tunnelEditVC = tunnelEditVC { if let tunnelEditVC = tunnelEditVC {
dismiss(tunnelEditVC) dismiss(tunnelEditVC)
} }
stopUpdatingRuntimeConfiguration()
} }
private func reloadRuntimeConfiguration() { private func reloadRuntimeConfiguration() {
tunnel.getRuntimeTunnelConfiguration(completionHandler: { tunnel.getRuntimeTunnelConfiguration(completionHandler: {
guard let tunnelConfiguration = $0 else { return } guard let tunnelConfiguration = $0 else { return }
if tunnelConfiguration == self.tunnel.tunnelConfiguration {
return
}
self.tunnelViewModel = TunnelViewModel(tunnelConfiguration: tunnelConfiguration) self.tunnelViewModel = TunnelViewModel(tunnelConfiguration: tunnelConfiguration)
// TODO(roopc): make this not loose scroll position // TODO(roopc): make this not loose scroll position
self.tableView.reloadData() self.tableView.reloadData()
self.tunnelEditVC = nil self.tunnelEditVC = nil
}) })
} }
func startUpdatingRuntimeConfiguration() {
reloadRuntimeConfiguration()
reloadRuntimeConfigurationTimer?.invalidate()
let reloadTimer = Timer(timeInterval: 1 /* second */, repeats: true) { [weak self] _ in
self?.reloadRuntimeConfiguration()
}
reloadRuntimeConfigurationTimer = reloadTimer
RunLoop.main.add(reloadTimer, forMode: .default)
}
func stopUpdatingRuntimeConfiguration() {
reloadRuntimeConfiguration()
reloadRuntimeConfigurationTimer?.invalidate()
reloadRuntimeConfigurationTimer = nil
}
} }
extension TunnelDetailTableViewController: NSTableViewDataSource { extension TunnelDetailTableViewController: NSTableViewDataSource {