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

Tunnel list: Fix importing zip with multiple configurations

This commit is contained in:
Roopesh Chander 2018-10-31 14:30:25 +05:30
parent efe019b643
commit dae0e10e20
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,21 +160,27 @@ class TunnelsListTableViewController: UITableViewController {
print("Error opening zip archive: \(error)") print("Error opening zip archive: \(error)")
} }
var numberOfConfigFilesWithErrors = 0 var numberOfConfigFilesWithErrors = 0
var tunnelConfigurationsToAdd: [TunnelConfiguration] = []
for unarchivedFile in unarchivedFiles { for unarchivedFile in unarchivedFiles {
if let fileBaseName = URL(string: unarchivedFile.fileName)?.deletingPathExtension().lastPathComponent, if let fileBaseName = URL(string: unarchivedFile.fileName)?.deletingPathExtension().lastPathComponent,
let fileContents = String(data: unarchivedFile.contents, encoding: .utf8), let fileContents = String(data: unarchivedFile.contents, encoding: .utf8),
let tunnelConfiguration = try? WgQuickConfigFileParser.parse(fileContents, name: fileBaseName) { let tunnelConfiguration = try? WgQuickConfigFileParser.parse(fileContents, name: fileBaseName) {
tunnelsManager?.add(tunnelConfiguration: tunnelConfiguration) { (tunnel, error) in tunnelConfigurationsToAdd.append(tunnelConfiguration)
if (error != nil) {
print("Error adding configuration: \(tunnelConfiguration.interface.name)")
}
}
} else { } else {
numberOfConfigFilesWithErrors = numberOfConfigFilesWithErrors + 1 numberOfConfigFilesWithErrors = numberOfConfigFilesWithErrors + 1
} }
} }
var numberOfTunnelsRemainingAfterError = 0
tunnelsManager?.addMultiple(tunnelConfigurations: tunnelConfigurationsToAdd) { (numberOfTunnelsRemaining, error) in
if (error != nil) {
numberOfTunnelsRemainingAfterError = numberOfTunnelsRemaining
} else {
assert(numberOfTunnelsRemaining == 0)
}
}
if (numberOfConfigFilesWithErrors > 0) { if (numberOfConfigFilesWithErrors > 0) {
showErrorAlert(title: "Could not import \(numberOfConfigFilesWithErrors) files", message: "\(numberOfConfigFilesWithErrors) of \(unarchivedFiles.count) files contained errors and were not imported") showErrorAlert(title: "Could not import \(numberOfConfigFilesWithErrors + numberOfTunnelsRemainingAfterError) files",
message: "\(numberOfConfigFilesWithErrors) of \(unarchivedFiles.count) files contained errors and were not imported")
} }
} }
} }