Merge branch 'develop' into release-0.8.1

1 files changed, 14 insertions, 6 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 92d2a8bd..420da7a1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -26,6 +26,7 @@ import de.blinkt.openvpn.activities.DisconnectVPN;
 import se.leap.bitmaskclient.eip.Constants;
 import se.leap.bitmaskclient.eip.EIP;
 import se.leap.bitmaskclient.eip.EipStatus;
+import se.leap.bitmaskclient.eip.VoidVpnService;
 
 public class EipFragment extends Fragment implements Observer {
 	
@@ -160,7 +161,7 @@ public class EipFragment extends Fragment implements Observer {
 	if(eip_status.isConnecting()) {
 	    askPendingStartCancellation();
 	} else if(eip_status.isConnected()) {
-	    stopEIP();
+	    askToStopEIP();
 	}
     }
 
@@ -171,7 +172,7 @@ public class EipFragment extends Fragment implements Observer {
 	    .setPositiveButton((R.string.yes), new DialogInterface.OnClickListener() {
 		    @Override
 		    public void onClick(DialogInterface dialog, int which) {
-			stopEIP();
+			askToStopEIP();
 		    }
 		})
 	    .setNegativeButton(parent_activity.getString(R.string.no), new DialogInterface.OnClickListener() {
@@ -197,7 +198,15 @@ public class EipFragment extends Fragment implements Observer {
 	eipCommand(Constants.ACTION_START_EIP);
     }
 
-    protected void stopEIP() {
+    private void stopEIP() {
+	if(eip_status.isConnecting())
+	    VoidVpnService.stop();
+	Intent disconnect_vpn = new Intent(parent_activity, DisconnectVPN.class);
+	parent_activity.startActivityForResult(disconnect_vpn, EIP.DISCONNECT);
+	eip_status.setDisconnecting();
+    }
+
+    protected void askToStopEIP() {
         hideProgressBar();
 
 	String status = parent_activity.getString(R.string.eip_state_not_connected);
@@ -306,14 +315,13 @@ public class EipFragment extends Fragment implements Observer {
 		case Activity.RESULT_OK:
 		    break;
 		case Activity.RESULT_CANCELED:
+		    
 		    break;
 		}
 	    } else if (request.equals(Constants.ACTION_STOP_EIP)) {
 		switch (resultCode){
 		case Activity.RESULT_OK:
-		    Intent disconnect_vpn = new Intent(parent_activity, DisconnectVPN.class);
-		    parent_activity.startActivityForResult(disconnect_vpn, EIP.DISCONNECT);
-		    eip_status.setDisconnecting();
+		    stopEIP();
 		    break;
 		case Activity.RESULT_CANCELED:
 		    break;