passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Zip importing: importFromFile should take a completionHandler 

Deletion of the being-imported file should be done in the
completionHandler.

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-12-12 19:24:12 +05:30
parent 7ef12d93a7
commit af78fa9a1c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WireGuard/WireGuard/UI/iOS/AppDelegate.swift
View File

@ -27,8 +27,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
} }
func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool { func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
mainVC?.tunnelsListVC?.importFromFile(url: url) mainVC?.tunnelsListVC?.importFromFile(url: url) {
_ = FileManager.deleteFile(at: url) _ = FileManager.deleteFile(at: url)
}
return true return true
} }

15
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
View File

@ -165,7 +165,7 @@ class TunnelsListTableViewController: UIViewController {
self.present(scanQRCodeNC, animated: true) self.present(scanQRCodeNC, animated: true)
} }
func importFromFile(url: URL) { func importFromFile(url: URL, completionHandler: (() -> Void)?) {
guard let tunnelsManager = tunnelsManager else { return } guard let tunnelsManager = tunnelsManager else { return }
if (url.pathExtension == "zip") { if (url.pathExtension == "zip") {
ZipImporter.importConfigFiles(from: url) { [weak self] result in ZipImporter.importConfigFiles(from: url) { [weak self] result in
@ -176,11 +176,12 @@ class TunnelsListTableViewController: UIViewController {
let configs: [TunnelConfiguration?] = result.value! let configs: [TunnelConfiguration?] = result.value!
tunnelsManager.addMultiple(tunnelConfigurations: configs.compactMap { $0 }) { [weak self] (numberSuccessful) in tunnelsManager.addMultiple(tunnelConfigurations: configs.compactMap { $0 }) { [weak self] (numberSuccessful) in
if numberSuccessful == configs.count { if numberSuccessful == configs.count {
completionHandler?()
return return
} }
ErrorPresenter.showErrorAlert(title: "Created \(numberSuccessful) tunnels", ErrorPresenter.showErrorAlert(title: "Created \(numberSuccessful) tunnels",
message: "Created \(numberSuccessful) of \(configs.count) tunnels from zip archive", message: "Created \(numberSuccessful) of \(configs.count) tunnels from zip archive",
from: self) from: self, onPresented: completionHandler)
} }
} }
} else /* if (url.pathExtension == "conf") -- we assume everything else is a conf */ { } else /* if (url.pathExtension == "conf") -- we assume everything else is a conf */ {
@ -189,13 +190,15 @@ class TunnelsListTableViewController: UIViewController {
let tunnelConfiguration = try? WgQuickConfigFileParser.parse(fileContents, name: fileBaseName) { let tunnelConfiguration = try? WgQuickConfigFileParser.parse(fileContents, name: fileBaseName) {
tunnelsManager.add(tunnelConfiguration: tunnelConfiguration) { [weak self] result in tunnelsManager.add(tunnelConfiguration: tunnelConfiguration) { [weak self] result in
if let error = result.error { if let error = result.error {
ErrorPresenter.showErrorAlert(error: error, from: self) ErrorPresenter.showErrorAlert(error: error, from: self, onPresented: completionHandler)
} else {
completionHandler?()
} }
} }
} else { } else {
ErrorPresenter.showErrorAlert(title: "Unable to import tunnel", ErrorPresenter.showErrorAlert(title: "Unable to import tunnel",
message: "An error occured when importing the tunnel configuration.", message: "An error occured when importing the tunnel configuration.",
from: self) from: self, onPresented: completionHandler)
} }
} }
} }
@ -205,7 +208,9 @@ class TunnelsListTableViewController: UIViewController {
extension TunnelsListTableViewController: UIDocumentPickerDelegate { extension TunnelsListTableViewController: UIDocumentPickerDelegate {
func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) { func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
urls.forEach(importFromFile) urls.forEach {
importFromFile(url: $0, completionHandler: nil)
}
} }
} }