From b5ef62ddee91e33bde5edf31fcd1104b891a0f43 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Mon, 29 Oct 2018 02:03:30 +0530 Subject: Import: Show errors when importing fails Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift') diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift index ee5e3ac..22ef487 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift @@ -149,6 +149,8 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate { print("Error adding configuration: \(tunnelConfiguration.interface.name)") } } + } else { + showErrorAlert(title: "Could not import", message: "The config file contained errors") } } else if (url.pathExtension == "zip") { var unarchivedFiles: [(fileName: String, contents: Data)] = [] @@ -161,6 +163,7 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate { } catch (let error) { print("Error opening zip archive: \(error)") } + var numberOfConfigFilesWithErrors = 0 for unarchivedFile in unarchivedFiles { if let fileBaseName = URL(string: unarchivedFile.fileName)?.deletingPathExtension().lastPathComponent, let fileContents = String(data: unarchivedFile.contents, encoding: .utf8), @@ -170,8 +173,13 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate { print("Error adding configuration: \(tunnelConfiguration.interface.name)") } } + } else { + numberOfConfigFilesWithErrors = numberOfConfigFilesWithErrors + 1 } } + if (numberOfConfigFilesWithErrors > 0) { + showErrorAlert(title: "Could not import \(numberOfConfigFilesWithErrors) files", message: "\(numberOfConfigFilesWithErrors) of \(unarchivedFiles.count) files contained errors and were not imported") + } } } } -- cgit v1.2.3-59-g8ed1b