diff options
author | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 22:48:03 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 22:48:03 +0100 |
commit | 673c4221554fc92d87fa306c8a95cefb75693d78 (patch) | |
tree | c2e74c1ab1d42f05a27f64b6d915a39f639ee7dc /app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java | |
parent | f10380f7d8bc85d8127328a9d9c092bc109bb340 (diff) | |
parent | 67ff3447f10c43770dc9ee4dccf358321063d131 (diff) |
Merge remote-tracking branch '0xacab/0.9.8' into 0.9.8/sidebar
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java | 19 |
1 files changed, 12 insertions, 7 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 b1aab79c..9a3c8f85 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java @@ -1,11 +1,12 @@ package se.leap.bitmaskclient.eip; -import android.app.*; -import android.content.*; -import android.net.*; -import android.os.*; +import android.app.Activity; +import android.content.Intent; +import android.net.VpnService; +import android.os.Build; +import android.os.Bundle; -import se.leap.bitmaskclient.Constants; +import static se.leap.bitmaskclient.Constants.EIP_ACTION_START_BLOCKING_VPN; public class VoidVpnLauncher extends Activity { @@ -30,8 +31,12 @@ public class VoidVpnLauncher extends Activity { if (requestCode == VPN_USER_PERMISSION) { if (resultCode == RESULT_OK) { Intent void_vpn_service = new Intent(getApplicationContext(), VoidVpnService.class); - void_vpn_service.setAction(Constants.EIP_ACTION_BLOCK_VPN_PROFILE); - startService(void_vpn_service); + 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); + } } } finish(); |