From eb8f94c398f5a15fd064917602608bb6725420ef Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 25 Jan 2019 15:23:23 +0100 Subject: clean up in EIP (cherry picked from commit 149ce40) --- .../main/java/se/leap/bitmaskclient/eip/EIP.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java index 0e6d9b95..0779c69d 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java @@ -175,7 +175,6 @@ public final class EIP extends JobIntentService implements Observer { } } - /** * Initiates an EIP connection by selecting a gateway and preparing and sending an * Intent to {@link de.blinkt.openvpn.LaunchVPN}. @@ -245,18 +244,9 @@ public final class EIP extends JobIntentService implements Observer { * @param gateway to connect to */ private void launchActiveGateway(@NonNull Gateway gateway, int nClosestGateway) { - /*Intent gatewaySetupWatcherIntent = new Intent(BROADCAST_GATEWAY_SETUP_OBSERVER_EVENT); - gatewaySetupWatcherIntent.putExtra(EIP_REQUEST, ) - gatewaySetupWatcherIntent.putExtra(LaunchVPN.EXTRA_TEMP_VPN_PROFILE, gateway.getProfile());*/ - - - Intent intent = new Intent(BROADCAST_GATEWAY_SETUP_OBSERVER_EVENT); //new Intent(this, LaunchVPN.class); - //intent.setAction(Intent.ACTION_MAIN); - //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - //intent.putExtra(LaunchVPN.EXTRA_HIDELOG, true); + Intent intent = new Intent(BROADCAST_GATEWAY_SETUP_OBSERVER_EVENT); intent.putExtra(EXTRA_TEMP_VPN_PROFILE, gateway.getProfile()); intent.putExtra(Gateway.KEY_N_CLOSEST_GATEWAY, nClosestGateway); - //startActivity(intent); LocalBroadcastManager.getInstance(this).sendBroadcast(intent); } @@ -294,14 +284,6 @@ public final class EIP extends JobIntentService implements Observer { return gatewaysManager; } - /** - * Updates the eip.json. It containes information about the vpn service of a provider such as - * available gateways, supported protocols and open ports. - */ - private void updateEipJson() { - - } - /** * read VPN certificate from preferences and check it * broadcast result @@ -409,7 +391,6 @@ public final class EIP extends JobIntentService implements Observer { startService(stopVoidVpnIntent); } - /** * creates a OpenVpnServiceConnection if necessary * then terminates OpenVPN -- cgit v1.2.3