Commit eb8f94c3 authored by cyberta's avatar cyberta

clean up in EIP

(cherry picked from commit 149ce40b)
parent 7881eea4
...@@ -175,7 +175,6 @@ public final class EIP extends JobIntentService implements Observer { ...@@ -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 * Initiates an EIP connection by selecting a gateway and preparing and sending an
* Intent to {@link de.blinkt.openvpn.LaunchVPN}. * Intent to {@link de.blinkt.openvpn.LaunchVPN}.
...@@ -245,18 +244,9 @@ public final class EIP extends JobIntentService implements Observer { ...@@ -245,18 +244,9 @@ public final class EIP extends JobIntentService implements Observer {
* @param gateway to connect to * @param gateway to connect to
*/ */
private void launchActiveGateway(@NonNull Gateway gateway, int nClosestGateway) { private void launchActiveGateway(@NonNull Gateway gateway, int nClosestGateway) {
/*Intent gatewaySetupWatcherIntent = new Intent(BROADCAST_GATEWAY_SETUP_OBSERVER_EVENT); Intent intent = 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.putExtra(EXTRA_TEMP_VPN_PROFILE, gateway.getProfile()); intent.putExtra(EXTRA_TEMP_VPN_PROFILE, gateway.getProfile());
intent.putExtra(Gateway.KEY_N_CLOSEST_GATEWAY, nClosestGateway); intent.putExtra(Gateway.KEY_N_CLOSEST_GATEWAY, nClosestGateway);
//startActivity(intent);
LocalBroadcastManager.getInstance(this).sendBroadcast(intent); LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
} }
...@@ -294,14 +284,6 @@ public final class EIP extends JobIntentService implements Observer { ...@@ -294,14 +284,6 @@ public final class EIP extends JobIntentService implements Observer {
return gatewaysManager; 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 * read VPN certificate from preferences and check it
* broadcast result * broadcast result
...@@ -409,7 +391,6 @@ public final class EIP extends JobIntentService implements Observer { ...@@ -409,7 +391,6 @@ public final class EIP extends JobIntentService implements Observer {
startService(stopVoidVpnIntent); startService(stopVoidVpnIntent);
} }
/** /**
* creates a OpenVpnServiceConnection if necessary * creates a OpenVpnServiceConnection if necessary
* then terminates OpenVPN * then terminates OpenVPN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment