diff options
author | Roopesh Chander <roop@roopc.net> | 2018-12-29 01:36:46 +0530 |
---|---|---|
committer | Roopesh Chander <roop@roopc.net> | 2019-01-14 14:52:29 +0530 |
commit | 6a27626fc003399b1f542b7ef64ea838001375dc (patch) | |
tree | 97306ad99b7c4fdd429a464068d3caa457f3e47e /WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift | |
parent | macOS: Add tunnel management menu items (diff) | |
download | wireguard-apple-6a27626fc003399b1f542b7ef64ea838001375dc.tar.xz wireguard-apple-6a27626fc003399b1f542b7ef64ea838001375dc.zip |
iOS: Refactor importFromFile
So that it can be used in macOS as well
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r-- | WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift index e6252d9..058063d 100644 --- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift @@ -157,49 +157,13 @@ class TunnelsListTableViewController: UIViewController { scanQRCodeNC.modalPresentationStyle = .fullScreen present(scanQRCodeNC, animated: true) } - - func importFromFile(url: URL, completionHandler: (() -> Void)?) { - guard let tunnelsManager = tunnelsManager else { return } - if url.pathExtension == "zip" { - ZipImporter.importConfigFiles(from: url) { [weak self] result in - if let error = result.error { - ErrorPresenter.showErrorAlert(error: error, from: self) - return - } - let configs = result.value! - tunnelsManager.addMultiple(tunnelConfigurations: configs.compactMap { $0 }) { [weak self] numberSuccessful in - if numberSuccessful == configs.count { - completionHandler?() - return - } - let title = tr(format: "alertImportedFromZipTitle (%d)", numberSuccessful) - let message = tr(format: "alertImportedFromZipMessage (%1$d of %2$d)", numberSuccessful, configs.count) - ErrorPresenter.showErrorAlert(title: title, message: message, from: self, onPresented: completionHandler) - } - } - } else /* if (url.pathExtension == "conf") -- we assume everything else is a conf */ { - let fileBaseName = url.deletingPathExtension().lastPathComponent.trimmingCharacters(in: .whitespacesAndNewlines) - if let fileContents = try? String(contentsOf: url), - let tunnelConfiguration = try? TunnelConfiguration(fromWgQuickConfig: fileContents, called: fileBaseName) { - tunnelsManager.add(tunnelConfiguration: tunnelConfiguration) { [weak self] result in - if let error = result.error { - ErrorPresenter.showErrorAlert(error: error, from: self, onPresented: completionHandler) - } else { - completionHandler?() - } - } - } else { - ErrorPresenter.showErrorAlert(title: tr("alertUnableToImportTitle"), message: tr("alertUnableToImportMessage"), - from: self, onPresented: completionHandler) - } - } - } } extension TunnelsListTableViewController: UIDocumentPickerDelegate { func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) { - urls.forEach { - importFromFile(url: $0, completionHandler: nil) + guard let tunnelsManager = tunnelsManager else { return } + urls.forEach { url in + TunnelImporter.importFromFile(url: url, into: tunnelsManager, sourceVC: self, errorPresenterType: ErrorPresenter.self) } } } |