]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Import: Show errors when importing fails
authorRoopesh Chander <roop@roopc.net>
Sun, 28 Oct 2018 20:33:30 +0000 (02:03 +0530)
committerRoopesh Chander <roop@roopc.net>
Sun, 28 Oct 2018 20:33:39 +0000 (02:03 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift

index ee5e3ac2188de21295a81020384fef862cd6d295..22ef487d7ea24d778762646bd7b95191e89d46ba 100644 (file)
@@ -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")
+                }
             }
         }
     }