From 63ae29d808da4c85c223f2e2b6824322b8fc45df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 17 Dec 2014 12:25:31 +0100
Subject: Stop normal and blocking VPNs correctly

---
 .../se/leap/bitmaskclient/eip/VoidVpnService.java  | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
index a6f9fe76..0c773208 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
@@ -2,14 +2,18 @@ package se.leap.bitmaskclient.eip;
 
 import android.content.Intent;
 import android.net.VpnService;
+import android.os.ParcelFileDescriptor;
+
+import java.io.IOException;
 
 public class VoidVpnService extends VpnService  {
 
     static final String TAG = VoidVpnService.class.getSimpleName();
+    static ParcelFileDescriptor fd;
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-	String action = intent.getAction();
+	String action = intent != null ? intent.getAction() : "";
 	if (action == Constants.START_BLOCKING_VPN_PROFILE) {
 	    new Thread(new Runnable() {
 		    public void run() {			
@@ -20,7 +24,7 @@ public class VoidVpnService extends VpnService  {
 			builder.addRoute("192.168.1.0", 24);
 			builder.addDnsServer("10.42.0.1");
 			try {
-			    builder.establish();
+			    fd = builder.establish();
 			} catch (Exception e) {
 			    e.printStackTrace();
 			}
@@ -30,4 +34,20 @@ public class VoidVpnService extends VpnService  {
 	}
 	return 0;
     }
+
+    @Override
+    public void onRevoke() {
+        super.onRevoke();
+    }
+
+    public static boolean stop() {
+        try {
+            fd.close();
+            return true;
+        } catch (IOException | NullPointerException e) {
+            android.util.Log.d(TAG, "VoidVpnService didn't stop");
+            e.printStackTrace();
+            return false;
+        }
+    }
 }
-- 
cgit v1.2.3