1 files changed, 14 insertions, 13 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
index e6905448..e2cd86b9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
@@ -3,10 +3,10 @@ package se.leap.bitmaskclient.eip;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.VpnService;
-import android.os.Build;
 import android.os.Bundle;
 
-import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_START_BLOCKING_VPN;
+import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_PREPARE_VPN;
+import static se.leap.bitmaskclient.eip.EipResultBroadcast.tellToReceiverOrBroadcast;
 
 public class VoidVpnLauncher extends Activity {
 
@@ -19,24 +19,25 @@ public class VoidVpnLauncher extends Activity {
     }
 
     public void setUp() {
-        Intent blocking_intent = VpnService.prepare(getApplicationContext()); // stops the VPN connection created by another application.
-        if (blocking_intent != null)
-            startActivityForResult(blocking_intent, VPN_USER_PERMISSION);
+        Intent blockingIntent = null;
+        try {
+            blockingIntent = VpnService.prepare(getApplicationContext()); // stops the VPN connection created by another application.
+        } catch (NullPointerException npe) {
+            tellToReceiverOrBroadcast(this.getApplicationContext(), EIP_ACTION_PREPARE_VPN, RESULT_CANCELED);
+            finish();
+        }
+        if (blockingIntent != null) {
+            startActivityForResult(blockingIntent, VPN_USER_PERMISSION);
+        }
         else {
-            onActivityResult(VPN_USER_PERMISSION, RESULT_OK, null);
+            EipCommand.startBlockingVPN(getApplicationContext());
         }
     }
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == VPN_USER_PERMISSION) {
             if (resultCode == RESULT_OK) {
-                Intent void_vpn_service = new Intent(getApplicationContext(), VoidVpnService.class);
-                void_vpn_service.setAction(EIP_ACTION_START_BLOCKING_VPN);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    startForegroundService(void_vpn_service);
-                } else {
-                    startService(void_vpn_service);
-                }
+                EipCommand.launchVoidVPN(getApplicationContext());
             }
         }
         finish();