From: Roopesh Chander <roop@roopc.net>
Date: Sun, 28 Oct 2018 20:33:30 +0000 (+0530)
Subject: Import: Show errors when importing fails
X-Git-Tag: 0.0.20181104-1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ef62ddee91e33bde5edf31fcd1104b891a0f43;p=thirdparty%2Fwireguard-apple.git

Import: Show errors when importing fails

Signed-off-by: Roopesh Chander <roop@roopc.net>
---

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")
+                }
             }
         }
     }