Ammend.

1 files changed, 18 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 0a707ab1..367a9f1d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
@@ -13,42 +13,29 @@ public class VoidVpnService extends VpnService  {
 
     @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) {
+            start();
+        }
 
-    @Override
-    public void onRevoke() {
-        super.onRevoke();
+        return 0;
     }
 
-    public static boolean stop() {
+    protected void start() {
+        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 {
-            if(fd != null)
-                fd.close();
-            return true;
-        } catch (IOException | NullPointerException e) {
-            android.util.Log.d(TAG, "VoidVpnService didn't stop");
+            fd = builder.establish();
+            if (fd != null)
+                android.util.Log.d(TAG, "VoidVpnService set up");
+            else
+                android.util.Log.d(TAG, "VoidVpnService failed to set up");
+        } catch (Exception e) {
             e.printStackTrace();
-            return false;
         }
     }
 }