From 1377153bc62a5afe9b98ea6793f900834432c15c Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 1 Nov 2018 15:59:17 +0530 Subject: Importing: Account for errors in showing the 'No configurations found' error Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'WireGuard') diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift index 1d87b27..3ef672a 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift @@ -153,10 +153,6 @@ class TunnelsListTableViewController: UITableViewController { } catch (let error) { print("Error opening zip archive: \(error)") } - guard (unarchivedFiles.count > 0) else { - showErrorAlert(title: "No configurations found", message: "Zip archive doesn't contain any .conf files") - return - } var numberOfConfigFilesWithErrors = 0 var tunnelConfigurationsToAdd: [TunnelConfiguration] = [] for unarchivedFile in unarchivedFiles { @@ -170,6 +166,10 @@ class TunnelsListTableViewController: UITableViewController { numberOfConfigFilesWithErrors = numberOfConfigFilesWithErrors + 1 } } + guard (tunnelConfigurationsToAdd.count > 0) else { + showErrorAlert(title: "No configurations found", message: "Zip archive doesn't contain any valid .conf files") + return + } var numberOfTunnelsRemainingAfterError = 0 tunnelsManager?.addMultiple(tunnelConfigurations: tunnelConfigurationsToAdd) { (numberOfTunnelsRemaining, error) in if (error != nil) { -- cgit v1.2.3-59-g8ed1b