From 0d7a585bf7cc53c7cbe34847dc6ffaf6ae9b692e Mon Sep 17 00:00:00 2001
From: Roopesh Chander <roop@roopc.net>
Date: Mon, 10 Dec 2018 17:00:31 +0530
Subject: [PATCH] TunnelsManager: Always call the completion handler before
 returning

Signed-off-by: Roopesh Chander <roop@roopc.net>
---
 WireGuard/WireGuard/VPN/TunnelsManager.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index c8c2b2a..d3f711a 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -26,6 +26,7 @@ enum TunnelsManagerError: WireGuardAppError {
     case vpnSystemErrorOnRemoveTunnel
 
     // Tunnel activation
+    case attemptingActivationWhenTunnelIsNotInactive
     case tunnelActivationAttemptFailed // startTunnel() throwed
     case tunnelActivationFailedInternalError // startTunnel() succeeded, but activation failed
     case tunnelActivationFailedNoInternetConnection // startTunnel() succeeded, but activation failed since no internet
@@ -45,6 +46,8 @@ enum TunnelsManagerError: WireGuardAppError {
         case .vpnSystemErrorOnRemoveTunnel:
             return ("Unable to remove tunnel", "Internal error")
 
+        case .attemptingActivationWhenTunnelIsNotInactive:
+            return ("Activation failure", "The tunnel is already active or in the process of being activated")
         case .tunnelActivationAttemptFailed:
             return ("Activation failure", "The tunnel could not be activated due to an internal error")
         case .tunnelActivationFailedInternalError:
@@ -232,6 +235,7 @@ class TunnelsManager {
 
     func startActivation(of tunnel: TunnelContainer, completionHandler: @escaping (TunnelsManagerError?) -> Void) {
         guard (tunnel.status == .inactive) else {
+            completionHandler(TunnelsManagerError.attemptingActivationWhenTunnelIsNotInactive)
             return
         }