From a99a755c340bb24e1d48a60fcfc74148a57f0586 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Fri, 8 Feb 2019 03:01:17 +0530 Subject: macOS: Show alert if exiting with an active tunnel Instead of deactivating the tunnel. Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/macOS/AppDelegate.swift | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'WireGuard/WireGuard/UI') diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift index 5546eef..fde1a27 100644 --- a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift +++ b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift @@ -12,6 +12,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { var manageTunnelsRootVC: ManageTunnelsRootViewController? var manageTunnelsWindowObject: NSWindow? + var isTerminationAlertShown = false func applicationDidFinishLaunching(_ aNotification: Notification) { Logger.configureGlobal(withFilePath: FileManager.appLogFileURL?.path) @@ -41,9 +42,25 @@ class AppDelegate: NSObject, NSApplicationDelegate { } } - func applicationWillTerminate(_ notification: Notification) { - if let currentTunnel = tunnelsTracker?.currentTunnel { - tunnelsManager?.startDeactivation(of: currentTunnel) + func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply { + guard let currentTunnel = tunnelsTracker?.currentTunnel, currentTunnel.status == .active || currentTunnel.status == .activating else { + return .terminateNow + } + if isTerminationAlertShown { + return .terminateNow + } + let alert = NSAlert() + alert.messageText = tr("macAppExitingWithActiveTunnelMessage") + alert.informativeText = tr("macAppExitingWithActiveTunnelInfo") + if let window = manageTunnelsWindowObject { + alert.beginSheetModal(for: window) { [weak self] _ in + self?.isTerminationAlertShown = true + NSApp.terminate(nil) + } + return .terminateCancel + } else { + alert.runModal() + return .terminateNow } } } -- cgit v1.2.3-59-g8ed1b