summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-03-24 12:53:51 +0100
committerParménides GV <parmegv@sdf.org>2015-03-24 12:53:51 +0100
commit92a48eda9956193cfb143875a849ff979e16e4a9 (patch)
treed500a1b8656e40234b2091f225d08b4f33fbe724 /app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
parent7c17d2654d9b6f32580e71e22ea08fca1893aa93 (diff)
Revert "Ammend."
This reverts commit 7c17d2654d9b6f32580e71e22ea08fca1893aa93.
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.java15
1 files changed, 3 insertions, 12 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 e7ce74d4..d79d8003 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnLauncher.java
@@ -1,7 +1,6 @@
package se.leap.bitmaskclient.eip;
import android.app.Activity;
-import android.content.ComponentName;
import android.content.Intent;
import android.net.VpnService;
import android.os.Bundle;
@@ -10,8 +9,6 @@ public class VoidVpnLauncher extends Activity {
private static final int VPN_USER_PERMISSION = 71;
- private static ComponentName service;
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -30,17 +27,11 @@ public class VoidVpnLauncher extends Activity {
protected void onActivityResult(int requestCode, int resultCode, Intent data){
if(requestCode == VPN_USER_PERMISSION) {
if(resultCode == RESULT_OK) {
- Intent intent = new Intent(getApplicationContext(), VoidVpnService.class);
- intent.setAction(Constants.START_BLOCKING_VPN_PROFILE);
- android.util.Log.d(VoidVpnLauncher.class.getSimpleName(), "VoidVpnService starting from Launcher");
-
- service = startService(intent);
+ Intent void_vpn_service = new Intent(getApplicationContext(), VoidVpnService.class);
+ void_vpn_service.setAction(Constants.START_BLOCKING_VPN_PROFILE);
+ startService(void_vpn_service);
}
}
finish();
}
-
- public static ComponentName getService() {
- return service;
- }
}