passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deduplicate functions

This commit is contained in:
Jason A. Donenfeld 2018-12-14 00:01:50 +01:00
parent 628ba73aa3
commit 19f16c3291
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WireGuard/WireGuard/Tunnel/TunnelsManager.swift
View File

@ -45,7 +45,7 @@ enum TunnelsManagerActivationError: WireGuardAppError {
var alertText: AlertText { var alertText: AlertText {
switch self { switch self {
case .activationFailed: case .activationFailed:
return ("Activation failure", "The tunnel could not be activated. Please ensure you are connected to the Internet.") return ("Activation failure", "The tunnel could not be activated. Please ensure that you are connected to the Internet.")
case .activationFailedWithExtensionError(let title, let message): case .activationFailedWithExtensionError(let title, let message):
return (title, message) return (title, message)
} }

10
WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift
View File

@ -6,16 +6,8 @@ import os.log
class ErrorPresenter { class ErrorPresenter {
static func showErrorAlert(error: WireGuardAppError, from sourceVC: UIViewController?, onPresented: (() -> Void)? = nil, onDismissal: (() -> Void)? = nil) { static func showErrorAlert(error: WireGuardAppError, from sourceVC: UIViewController?, onPresented: (() -> Void)? = nil, onDismissal: (() -> Void)? = nil) {
guard let sourceVC = sourceVC else { return }
let (title, message) = error.alertText let (title, message) = error.alertText
let okAction = UIAlertAction(title: "OK", style: .default) { _ in showErrorAlert(title: title, message: message, from: sourceVC, onPresented: onPresented, onDismissal: onDismissal)
onDismissal?()
}
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(okAction)
sourceVC.present(alert, animated: true, completion: onPresented)
} }
static func showErrorAlert(title: String, message: String, from sourceVC: UIViewController?, onPresented: (() -> Void)? = nil, onDismissal: (() -> Void)? = nil) { static func showErrorAlert(title: String, message: String, from sourceVC: UIViewController?, onPresented: (() -> Void)? = nil, onDismissal: (() -> Void)? = nil) {