Importing: Make use of lastError returned from TunnelsManager.addMultiple()

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

diff --git a/WireGuard/WireGuard/UI/TunnelImporter.swift b/WireGuard/WireGuard/UI/TunnelImporter.swift
index a306a7e094d8bdfa80f83cd84943335a0b0b0bfc..1b0fd7e58b9abef0cdcfb2acb215e321b43738ce 100644 (file)
--- a/WireGuard/WireGuard/UI/TunnelImporter.swift
+++ b/WireGuard/WireGuard/UI/TunnelImporter.swift
@@ -56,29 +56,28 @@ class TunnelImporter {
             }
         }
         dispatchGroup.notify(queue: .main) {
-            tunnelsManager.addMultiple(tunnelConfigurations: configs.compactMap { $0 }) { numberSuccessful, _ in
+            tunnelsManager.addMultiple(tunnelConfigurations: configs.compactMap { $0 }) { numberSuccessful, lastAddError in
                 if !configs.isEmpty && numberSuccessful == configs.count {
                     completionHandler?()
                     return
                 }
-                let title: String
-                let message: String
+                let alertText: (title: String, message: String)?
                 if urls.count == 1 {
                     if urls.first!.pathExtension.lowercased() == "zip" && !configs.isEmpty {
-                        title = tr(format: "alertImportedFromZipTitle (%d)", numberSuccessful)
-                        message = tr(format: "alertImportedFromZipMessage (%1$d of %2$d)", numberSuccessful, configs.count)
-                    } else if let lastFileImportErrorText = lastFileImportErrorText {
-                        title = lastFileImportErrorText.title
-                        message = lastFileImportErrorText.message
+                        alertText = (title: tr(format: "alertImportedFromZipTitle (%d)", numberSuccessful),
+                                     message: tr(format: "alertImportedFromZipMessage (%1$d of %2$d)", numberSuccessful, configs.count))
                     } else {
-                        completionHandler?()
-                        return
+                        alertText = lastFileImportErrorText ?? lastAddError?.alertText
                     }
                 } else {
-                    title = tr(format: "alertImportedFromMultipleFilesTitle (%d)", numberSuccessful)
-                    message = tr(format: "alertImportedFromMultipleFilesMessage (%1$d of %2$d)", numberSuccessful, configs.count)
+                    alertText = (title: tr(format: "alertImportedFromMultipleFilesTitle (%d)", numberSuccessful),
+                                 message: tr(format: "alertImportedFromMultipleFilesMessage (%1$d of %2$d)", numberSuccessful, configs.count))
+                }
+                if let alertText = alertText {
+                    errorPresenterType.showErrorAlert(title: alertText.title, message: alertText.message, from: sourceVC, onPresented: completionHandler)
+                } else {
+                    completionHandler?()
                 }
-                errorPresenterType.showErrorAlert(title: title, message: message, from: sourceVC, onPresented: completionHandler)
             }
         }
     }