1 files changed, 39 insertions, 31 deletions

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 0c773208..dac92fe2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
@@ -1,53 +1,61 @@
 package se.leap.bitmaskclient.eip;
 
-import android.content.Intent;
-import android.net.VpnService;
-import android.os.ParcelFileDescriptor;
+import android.content.*;
+import android.net.*;
+import android.os.*;
 
-import java.io.IOException;
+import java.io.*;
 
-public class VoidVpnService extends VpnService  {
+public class VoidVpnService extends VpnService {
 
     static final String TAG = VoidVpnService.class.getSimpleName();
     static ParcelFileDescriptor fd;
 
+    static Thread thread;
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-	String action = intent != null ? intent.getAction() : "";
-	if (action == Constants.START_BLOCKING_VPN_PROFILE) {
-	    new Thread(new Runnable() {
-		    public void run() {			
-			Builder builder = new Builder();
-			builder.setSession("Blocking until running");
-			builder.addAddress("10.42.0.8",16);
-			builder.addRoute("0.0.0.0", 1);
-			builder.addRoute("192.168.1.0", 24);
-			builder.addDnsServer("10.42.0.1");
-			try {
-			    fd = builder.establish();
-			} catch (Exception e) {
-			    e.printStackTrace();
-			}
-			android.util.Log.d(TAG, "VoidVpnService set up");
-		    }
-		}).run();
-	}
-	return 0;
+        String action = intent != null ? intent.getAction() : "";
+        if (action == Constants.START_BLOCKING_VPN_PROFILE) {
+            thread = new Thread(new Runnable() {
+                public void run() {
+                    Builder builder = new Builder();
+                    builder.setSession("Blocking until running");
+                    builder.addAddress("10.42.0.8", 16);
+                    builder.addRoute("0.0.0.0", 1);
+                    builder.addRoute("192.168.1.0", 24);
+                    builder.addDnsServer("10.42.0.1");
+                    try {
+                        fd = builder.establish();
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            thread.run();
+        }
+        return 0;
     }
 
     @Override
     public void onRevoke() {
         super.onRevoke();
+        closeFd();
+    }
+
+    public static void stop() {
+        if (thread != null)
+            thread.interrupt();
+        closeFd();
     }
 
-    public static boolean stop() {
+    private static void closeFd() {
         try {
-            fd.close();
-            return true;
-        } catch (IOException | NullPointerException e) {
-            android.util.Log.d(TAG, "VoidVpnService didn't stop");
+            if (fd != null)
+                fd.close();
+        } catch (IOException e) {
             e.printStackTrace();
-            return false;
         }
     }
 }