aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--WireGuard/WireGuard/UI/macOS/StatusMenu.swift158
1 files changed, 54 insertions, 104 deletions
diff --git a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
index 634ea9f..2ae3013 100644
--- a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
+++ b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
@@ -3,27 +3,25 @@
import Cocoa
+protocol StatusMenuWindowDelegate: class {
+ func manageTunnelsWindow() -> NSWindow
+}
+
class StatusMenu: NSMenu {
let tunnelsManager: TunnelsManager
- var tunnelStatusObservers = [AnyObject]()
var statusMenuItem: NSMenuItem?
var networksMenuItem: NSMenuItem?
var firstTunnelMenuItemIndex = 0
var numberOfTunnelMenuItems = 0
- @objc dynamic var currentTunnel: TunnelContainer?
-
- var manageTunnelsRootVC: ManageTunnelsRootViewController?
- lazy var manageTunnelsWindow: NSWindow = {
- manageTunnelsRootVC = ManageTunnelsRootViewController(tunnelsManager: tunnelsManager)
- let window = NSWindow(contentViewController: manageTunnelsRootVC!)
- window.title = tr("macWindowTitleManageTunnels")
- window.setContentSize(NSSize(width: 800, height: 480))
- window.setFrameAutosaveName(NSWindow.FrameAutosaveName("ManageTunnelsWindow")) // Auto-save window position and size
- return window
- }()
+ var currentTunnel: TunnelContainer? {
+ didSet {
+ updateStatusMenuItems(with: currentTunnel)
+ }
+ }
+ weak var windowDelegate: StatusMenuWindowDelegate?
init(tunnelsManager: TunnelsManager) {
self.tunnelsManager = tunnelsManager
@@ -31,16 +29,6 @@ class StatusMenu: NSMenu {
addStatusMenuItems()
addItem(NSMenuItem.separator())
- for index in 0 ..< tunnelsManager.numberOfTunnels() {
- let tunnel = tunnelsManager.tunnel(at: index)
- if tunnel.status != .inactive {
- currentTunnel = tunnel
- }
- let isUpdated = updateStatusMenuItems(with: tunnel, ignoreInactive: true)
- if isUpdated {
- break
- }
- }
firstTunnelMenuItemIndex = numberOfItems
let isAdded = addTunnelMenuItems()
@@ -69,19 +57,21 @@ class StatusMenu: NSMenu {
self.networksMenuItem = networksMenuItem
}
- @discardableResult
//swiftlint:disable:next cyclomatic_complexity
- func updateStatusMenuItems(with tunnel: TunnelContainer, ignoreInactive: Bool) -> Bool {
- guard let statusMenuItem = statusMenuItem, let networksMenuItem = networksMenuItem else { return false }
+ func updateStatusMenuItems(with tunnel: TunnelContainer?) {
+ guard let statusMenuItem = statusMenuItem, let networksMenuItem = networksMenuItem else { return }
+ guard let tunnel = tunnel else {
+ statusMenuItem.title = tr(format: "macStatus (%@)", tr("tunnelStatusInactive"))
+ networksMenuItem.title = ""
+ networksMenuItem.isHidden = true
+ return
+ }
var statusText: String
switch tunnel.status {
case .waiting:
- return false
+ statusText = tr("tunnelStatusWaiting")
case .inactive:
- if ignoreInactive {
- return false
- }
statusText = tr("tunnelStatusInactive")
case .activating:
statusText = tr("tunnelStatusActivating")
@@ -98,7 +88,7 @@ class StatusMenu: NSMenu {
statusMenuItem.title = tr(format: "macStatus (%@)", statusText)
if tunnel.status == .inactive {
- networksMenuItem.title = tr("macMenuNetworksInactive")
+ networksMenuItem.title = ""
networksMenuItem.isHidden = true
} else {
let allowedIPs = tunnel.tunnelConfiguration?.peers.flatMap { $0.allowedIPs }.map { $0.stringRepresentation }.joined(separator: ", ") ?? ""
@@ -109,7 +99,6 @@ class StatusMenu: NSMenu {
}
networksMenuItem.isHidden = false
}
- return true
}
func addTunnelMenuItems() -> Bool {
@@ -140,24 +129,25 @@ class StatusMenu: NSMenu {
}
@objc func tunnelClicked(sender: AnyObject) {
- guard let tunnelMenuItem = sender as? NSMenuItem else { return }
- guard let tunnel = tunnelMenuItem.representedObject as? TunnelContainer else { return }
+ guard let tunnelMenuItem = sender as? TunnelMenuItem else { return }
if tunnelMenuItem.state == .off {
- tunnelsManager.startActivation(of: tunnel)
+ tunnelsManager.startActivation(of: tunnelMenuItem.tunnel)
} else {
- tunnelsManager.startDeactivation(of: tunnel)
+ tunnelsManager.startDeactivation(of: tunnelMenuItem.tunnel)
}
}
@objc func manageTunnelsClicked() {
NSApp.activate(ignoringOtherApps: true)
+ guard let manageTunnelsWindow = windowDelegate?.manageTunnelsWindow() else { return }
manageTunnelsWindow.makeKeyAndOrderFront(self)
}
@objc func importTunnelsClicked() {
NSApp.activate(ignoringOtherApps: true)
+ guard let manageTunnelsWindow = windowDelegate?.manageTunnelsWindow() else { return }
manageTunnelsWindow.makeKeyAndOrderFront(self)
- ImportPanelPresenter.presentImportPanel(tunnelsManager: tunnelsManager, sourceVC: manageTunnelsRootVC!)
+ ImportPanelPresenter.presentImportPanel(tunnelsManager: tunnelsManager, sourceVC: manageTunnelsWindow.contentViewController)
}
@objc func aboutClicked() {
@@ -179,22 +169,8 @@ class StatusMenu: NSMenu {
extension StatusMenu {
func insertTunnelMenuItem(for tunnel: TunnelContainer, at tunnelIndex: Int) {
- let menuItem = NSMenuItem(title: tunnel.name, action: #selector(tunnelClicked(sender:)), keyEquivalent: "")
+ let menuItem = TunnelMenuItem(tunnel: tunnel, action: #selector(tunnelClicked(sender:)))
menuItem.target = self
- menuItem.representedObject = tunnel
- updateTunnelMenuItem(menuItem)
- let statusObservationToken = tunnel.observe(\.status) { [weak self] tunnel, _ in
- updateTunnelMenuItem(menuItem)
- if tunnel.status == .deactivating || tunnel.status == .inactive {
- if self?.currentTunnel == tunnel {
- self?.currentTunnel = self?.tunnelsManager.waitingTunnel()
- }
- } else {
- self?.currentTunnel = tunnel
- }
- self?.updateStatusMenuItems(with: tunnel, ignoreInactive: false)
- }
- tunnelStatusObservers.insert(statusObservationToken, at: tunnelIndex)
insertItem(menuItem, at: firstTunnelMenuItemIndex + tunnelIndex)
if numberOfTunnelMenuItems == 0 {
insertItem(NSMenuItem.separator(), at: firstTunnelMenuItemIndex + tunnelIndex + 1)
@@ -204,7 +180,6 @@ extension StatusMenu {
func removeTunnelMenuItem(at tunnelIndex: Int) {
removeItem(at: firstTunnelMenuItemIndex + tunnelIndex)
- tunnelStatusObservers.remove(at: tunnelIndex)
numberOfTunnelMenuItems -= 1
if numberOfTunnelMenuItems == 0 {
if let firstItem = item(at: firstTunnelMenuItemIndex), firstItem.isSeparatorItem {
@@ -214,73 +189,48 @@ extension StatusMenu {
}
func moveTunnelMenuItem(from oldTunnelIndex: Int, to newTunnelIndex: Int) {
- let oldMenuItem = item(at: firstTunnelMenuItemIndex + oldTunnelIndex)!
- let oldMenuItemTitle = oldMenuItem.title
- let oldMenuItemTunnel = oldMenuItem.representedObject
+ guard let oldMenuItem = item(at: firstTunnelMenuItemIndex + oldTunnelIndex) as? TunnelMenuItem else { return }
+ let oldMenuItemTunnel = oldMenuItem.tunnel
removeItem(at: firstTunnelMenuItemIndex + oldTunnelIndex)
- let menuItem = NSMenuItem(title: oldMenuItemTitle, action: #selector(tunnelClicked(sender:)), keyEquivalent: "")
+ let menuItem = TunnelMenuItem(tunnel: oldMenuItemTunnel, action: #selector(tunnelClicked(sender:)))
menuItem.target = self
- menuItem.representedObject = oldMenuItemTunnel
insertItem(menuItem, at: firstTunnelMenuItemIndex + newTunnelIndex)
- let statusObserver = tunnelStatusObservers.remove(at: oldTunnelIndex)
- tunnelStatusObservers.insert(statusObserver, at: newTunnelIndex)
- }
-}
-
-private func updateTunnelMenuItem(_ tunnelMenuItem: NSMenuItem) {
- guard let tunnel = tunnelMenuItem.representedObject as? TunnelContainer else { return }
- tunnelMenuItem.title = tunnel.name
- let shouldShowCheckmark = (tunnel.status != .inactive && tunnel.status != .deactivating)
- tunnelMenuItem.state = shouldShowCheckmark ? .on : .off
-}
-extension StatusMenu: TunnelsManagerListDelegate {
- func tunnelAdded(at index: Int) {
- let tunnel = tunnelsManager.tunnel(at: index)
- insertTunnelMenuItem(for: tunnel, at: index)
- manageTunnelsRootVC?.tunnelsListVC?.tunnelAdded(at: index)
}
+}
- func tunnelModified(at index: Int) {
- if let tunnelMenuItem = item(at: firstTunnelMenuItemIndex + index) {
- updateTunnelMenuItem(tunnelMenuItem)
- }
- manageTunnelsRootVC?.tunnelsListVC?.tunnelModified(at: index)
- }
+class TunnelMenuItem: NSMenuItem {
- func tunnelMoved(from oldIndex: Int, to newIndex: Int) {
- moveTunnelMenuItem(from: oldIndex, to: newIndex)
- manageTunnelsRootVC?.tunnelsListVC?.tunnelMoved(from: oldIndex, to: newIndex)
- }
+ var tunnel: TunnelContainer
- func tunnelRemoved(at index: Int) {
- removeTunnelMenuItem(at: index)
- manageTunnelsRootVC?.tunnelsListVC?.tunnelRemoved(at: index)
- }
-}
+ private var statusObservationToken: AnyObject?
+ private var nameObservationToken: AnyObject?
-extension StatusMenu: TunnelsManagerActivationDelegate {
- func tunnelActivationAttemptFailed(tunnel: TunnelContainer, error: TunnelsManagerActivationAttemptError) {
- if let manageTunnelsRootVC = manageTunnelsRootVC, manageTunnelsWindow.isVisible {
- ErrorPresenter.showErrorAlert(error: error, from: manageTunnelsRootVC)
- } else {
- ErrorPresenter.showErrorAlert(error: error, from: nil)
+ init(tunnel: TunnelContainer, action selector: Selector?) {
+ self.tunnel = tunnel
+ super.init(title: tunnel.name, action: selector, keyEquivalent: "")
+ updateStatus()
+ let statusObservationToken = tunnel.observe(\.status) { [weak self] _, _ in
+ self?.updateStatus()
+ }
+ updateTitle()
+ let nameObservationToken = tunnel.observe(\TunnelContainer.name) { [weak self] _, _ in
+ self?.updateTitle()
}
+ self.statusObservationToken = statusObservationToken
+ self.nameObservationToken = nameObservationToken
}
- func tunnelActivationAttemptSucceeded(tunnel: TunnelContainer) {
- // Nothing to do
+ required init(coder decoder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
}
- func tunnelActivationFailed(tunnel: TunnelContainer, error: TunnelsManagerActivationError) {
- if let manageTunnelsRootVC = manageTunnelsRootVC, manageTunnelsWindow.isVisible {
- ErrorPresenter.showErrorAlert(error: error, from: manageTunnelsRootVC)
- } else {
- ErrorPresenter.showErrorAlert(error: error, from: nil)
- }
+ func updateTitle() {
+ title = tunnel.name
}
- func tunnelActivationSucceeded(tunnel: TunnelContainer) {
- // Nothing to do
+ func updateStatus() {
+ let shouldShowCheckmark = (tunnel.status != .inactive && tunnel.status != .deactivating)
+ state = shouldShowCheckmark ? .on : .off
}
}