From cb778fe7e0bb27c33f2f4efc83d03e5f696c979f Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sat, 5 Jan 2019 19:16:16 +0530 Subject: macOS: Consolidate presenting of the import panel Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/macOS/StatusMenu.swift | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'WireGuard/WireGuard/UI/macOS/StatusMenu.swift') diff --git a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift index b8693c9..39c0f32 100644 --- a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift +++ b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift @@ -132,14 +132,7 @@ class StatusMenu: NSMenu { @objc func importTunnelsClicked() { NSApp.activate(ignoringOtherApps: true) manageTunnelsWindow.makeKeyAndOrderFront(self) - let openPanel = NSOpenPanel() - openPanel.allowedFileTypes = ["conf", "zip"] - openPanel.beginSheetModal(for: manageTunnelsWindow) { [weak tunnelsManager] response in - guard let tunnelsManager = tunnelsManager else { return } - guard response == .OK else { return } - guard let url = openPanel.url else { return } - TunnelImporter.importFromFile(url: url, into: tunnelsManager, sourceVC: nil, errorPresenterType: ErrorPresenter.self) - } + ImportPanelPresenter.presentImportPanel(tunnelsManager: tunnelsManager, sourceVC: manageTunnelsRootVC!) } } -- cgit v1.2.3-59-g8ed1b