From ec031b1f19c7b85b52ef478b8dfe3f8e173cf046 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 21 Dec 2018 18:50:32 +0100 Subject: Get rid of superflous isActivateOnDemandEnabled key Signed-off-by: Jason A. Donenfeld --- WireGuard/WireGuard/Tunnel/TunnelErrors.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'WireGuard/WireGuard/Tunnel/TunnelErrors.swift') diff --git a/WireGuard/WireGuard/Tunnel/TunnelErrors.swift b/WireGuard/WireGuard/Tunnel/TunnelErrors.swift index c3d15b2..9b2b574 100644 --- a/WireGuard/WireGuard/Tunnel/TunnelErrors.swift +++ b/WireGuard/WireGuard/Tunnel/TunnelErrors.swift @@ -51,15 +51,15 @@ enum TunnelsManagerActivationAttemptError: WireGuardAppError { } enum TunnelsManagerActivationError: WireGuardAppError { - case activationFailed - case activationFailedWithExtensionError(title: String, message: String) + case activationFailed(wasOnDemandEnabled: Bool) + case activationFailedWithExtensionError(title: String, message: String, wasOnDemandEnabled: Bool) var alertText: AlertText { switch self { - case .activationFailed: - return (tr("alertTunnelActivationFailureTitle"), tr("alertTunnelActivationFailureMessage")) - case .activationFailedWithExtensionError(let title, let message): - return (title, message) + case .activationFailed(let wasOnDemandEnabled): + return (tr("alertTunnelActivationFailureTitle"), tr("alertTunnelActivationFailureMessage") + (wasOnDemandEnabled ? tr("alertTunnelActivationFailureOnDemandAddendum") : "")) + case .activationFailedWithExtensionError(let title, let message, let wasOnDemandEnabled): + return (title, message + (wasOnDemandEnabled ? tr("alertTunnelActivationFailureOnDemandAddendum") : "")) } } } -- cgit v1.2.3-59-g8ed1b