From c827a0030749944269afa7c65d91ecdcf9ab8080 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 6 Dec 2018 19:22:48 +0530 Subject: Error handling: Use ErrorPresenter.showErrorAlert() instead of per-VC showErrorAlert() methods Signed-off-by: Roopesh Chander --- .../WireGuard/UI/iOS/SettingsTableViewController.swift | 14 +++----------- .../UI/iOS/TunnelDetailTableViewController.swift | 8 -------- .../UI/iOS/TunnelEditTableViewController.swift | 8 -------- .../UI/iOS/TunnelsListTableViewController.swift | 17 ++++++----------- 4 files changed, 9 insertions(+), 38 deletions(-) (limited to 'WireGuard/WireGuard/UI/iOS') diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift index 7beb2e9..4c8c9a1 100644 --- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift @@ -101,14 +101,14 @@ class SettingsTableViewController: UITableViewController { if (FileManager.default.fileExists(atPath: destinationURL.path)) { let isDeleted = FileManager.deleteFile(at: destinationURL) if (!isDeleted) { - showErrorAlert(title: "No log available", message: "The pre-existing log could not be cleared") + ErrorPresenter.showErrorAlert(title: "No log available", message: "The pre-existing log could not be cleared", from: self) return } } guard let networkExtensionLogFileURL = FileManager.networkExtensionLogFileURL, FileManager.default.fileExists(atPath: networkExtensionLogFileURL.path) else { - showErrorAlert(title: "No log available", message: "Please activate a tunnel and then export the log") + ErrorPresenter.showErrorAlert(title: "No log available", message: "Please activate a tunnel and then export the log", from: self) return } @@ -116,7 +116,7 @@ class SettingsTableViewController: UITableViewController { try FileManager.default.copyItem(at: networkExtensionLogFileURL, to: destinationURL) } catch { os_log("Failed to copy file: %{public}@ to %{public}@: %{public}@", log: OSLog.default, type: .error, networkExtensionLogFileURL.absoluteString, destinationURL.absoluteString, error.localizedDescription) - showErrorAlert(title: "No log available", message: "The log could not be accessed") + ErrorPresenter.showErrorAlert(title: "No log available", message: "The log could not be accessed", from: self) return } @@ -130,14 +130,6 @@ class SettingsTableViewController: UITableViewController { } self.present(activityVC, animated: true) } - - func showErrorAlert(title: String, message: String) { - let okAction = UIAlertAction(title: "OK", style: .default) - let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) - alert.addAction(okAction) - - self.present(alert, animated: true, completion: nil) - } } // MARK: UITableViewDataSource diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift index 1bb337c..99d751b 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift @@ -53,14 +53,6 @@ class TunnelDetailTableViewController: UITableViewController { present(editNC, animated: true) } - func showErrorAlert(title: String, message: String) { - let okAction = UIAlertAction(title: "OK", style: .default) - let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) - alert.addAction(okAction) - - self.present(alert, animated: true, completion: nil) - } - func showConfirmationAlert(message: String, buttonTitle: String, from sourceView: UIView, onConfirmed: @escaping (() -> Void)) { let destroyAction = UIAlertAction(title: buttonTitle, style: .destructive) { (_) in diff --git a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift index ca5e6a8..c110d73 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift @@ -116,14 +116,6 @@ class TunnelEditTableViewController: UITableViewController { dismiss(animated: true, completion: nil) self.delegate?.tunnelEditingCancelled() } - - func showErrorAlert(title: String, message: String) { - let okAction = UIAlertAction(title: "OK", style: .default) - let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) - alert.addAction(okAction) - - self.present(alert, animated: true, completion: nil) - } } // MARK: UITableViewDataSource diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift index 4450796..4cff27c 100644 --- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift @@ -154,14 +154,6 @@ class TunnelsListTableViewController: UIViewController { self.present(scanQRCodeNC, animated: true) } - func showErrorAlert(title: String, message: String) { - let okAction = UIAlertAction(title: "OK", style: .default) - let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) - alert.addAction(okAction) - - self.present(alert, animated: true, completion: nil) - } - func importFromFile(url: URL) { guard let tunnelsManager = tunnelsManager else { return } if (url.pathExtension == "zip") { @@ -175,8 +167,9 @@ class TunnelsListTableViewController: UIViewController { if numberSuccessful == configs.count { return } - self?.showErrorAlert(title: "Created \(numberSuccessful) tunnels", - message: "Created \(numberSuccessful) of \(configs.count) tunnels from zip archive") + ErrorPresenter.showErrorAlert(title: "Created \(numberSuccessful) tunnels", + message: "Created \(numberSuccessful) of \(configs.count) tunnels from zip archive", + from: self) } } } else /* if (url.pathExtension == "conf") -- we assume everything else is a conf */ { @@ -189,7 +182,9 @@ class TunnelsListTableViewController: UIViewController { } } } else { - showErrorAlert(title: "Unable to import tunnel", message: "An error occured when importing the tunnel configuration.") + ErrorPresenter.showErrorAlert(title: "Unable to import tunnel", + message: "An error occured when importing the tunnel configuration.", + from: self) } } } -- cgit v1.2.3-59-g8ed1b