summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-06-18 20:22:40 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-06-20 18:54:33 -0600
commit98b27656cdb2e76bf966baad0dd8766fd1ebbbdd (patch)
tree614fff205ff8d0c6334b997f83f65e4c80453810 /src
parent3fb8205af4d58a5fec930440fe05f766271eec2f (diff)
Remove superfluous comments
Unused import removal
Diffstat (limited to 'src')
-rw-r--r--src/se/leap/leapclient/Dashboard.java22
-rw-r--r--src/se/leap/leapclient/EIP.java47
2 files changed, 2 insertions, 67 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index 965e8692..d88d09e9 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -65,7 +65,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
if(ConfigHelper.shared_preferences == null)
ConfigHelper.setSharedPreferences(preferences);
- // Check if we have preferences, run configuration wizard if not
// TODO We should do a better check for config that this!
if (preferences.contains("provider") && preferences.getString(ConfigHelper.PROVIDER_KEY, null) != null)
buildDashboard();
@@ -95,14 +94,11 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
protected void onActivityResult(int requestCode, int resultCode, Intent data){
if ( requestCode == CONFIGURE_LEAP ) {
if ( resultCode == RESULT_OK ){
- // Configuration done, get our preferences again
preferences = getSharedPreferences(ConfigHelper.PREFERENCES_KEY,MODE_PRIVATE);
- // Update eip-service local parsing
startService( new Intent(EIP.ACTION_UPDATE_EIP_SERVICE) );
buildDashboard();
} else {
- // Something went wrong in configuration
AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getAppContext());
alertBuilder.setTitle(getResources().getString(R.string.setup_error_title));
alertBuilder
@@ -127,16 +123,14 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
}
private void buildDashboard() {
- // Get our provider
provider = Provider.getInstance();
provider.init( this );
- // Set provider name in textview
providerNameTV = (TextView) findViewById(R.id.providerName);
providerNameTV.setText(provider.getName());
providerNameTV.setTextSize(28); // TODO maybe to some calculating, or a marquee?
- if ( provider.hasEIP() /*&& provider.getEIP() != null*/){
+ if ( provider.hasEIP() ){
// FIXME let's schedule this, so we're not doing it when we load the app
startService( new Intent(EIP.ACTION_UPDATE_EIP_SERVICE) );
if (provider.getEIPType() == "OpenVPN")
@@ -156,25 +150,20 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
((ViewStub) findViewById(R.id.eipOverviewStub)).inflate();
- // Set our EIP type title
eipTypeTV = (TextView) findViewById(R.id.eipType);
eipTypeTV.setText(provider.getEIPType());
- // Show our EIP detail
eipDetail = ((RelativeLayout) findViewById(R.id.eipDetail));
View eipSettings = findViewById(R.id.eipSettings);
eipSettings.setVisibility(View.GONE); // FIXME too!
eipDetail.setVisibility(View.VISIBLE);
eipStatus = (TextView) findViewById(R.id.eipStatus);
- // TODO Bind our switch to run our EIP
- // What happens when our VPN stops running? does it call the listener?
eipSwitch = (Switch) findViewById(R.id.eipSwitch);
eipSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (!mEipWait){
- // We're gonna have to have some patience!
buttonView.setClickable(false);
mEipWait = true;
@@ -205,7 +194,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
}
// FIXME!! I will move to EIPSettingsFragment and begone!
- // Also means change onClick property for status line
public void showEIPLog(View view){
Intent intent = new Intent(getBaseContext(),LogWindow.class);
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -231,7 +219,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.client_dashboard, menu);
return true;
}
@@ -239,7 +226,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
@Override
public boolean onOptionsItemSelected(MenuItem item){
Intent intent;
- // Handle item selection
switch (item.getItemId()){
case R.id.about_leap:
// TODO move se.leap.openvpn.AboutFragment into our package
@@ -248,12 +234,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
trans.replace(R.id.dashboardLayout, aboutFragment);
trans.addToBackStack(null);
trans.commit();
-
- //intent = new Intent(this,AboutFragment.class);
- //startActivity(intent);
return true;
case R.id.legacy_interface:
- // TODO call se.leap.openvpn.MainActivity
intent = new Intent(this,MainActivity.class);
startActivity(intent);
return true;
@@ -426,9 +408,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
protected void onReceiveResult(int resultCode, Bundle resultData) {
super.onReceiveResult(resultCode, resultData);
- // What were we asking for, again?
String request = resultData.getString(ConfigHelper.REQUEST_TAG);
- // Should the EIP switch be on?
mEipWait = true;
boolean checked = false;
diff --git a/src/se/leap/leapclient/EIP.java b/src/se/leap/leapclient/EIP.java
index 867805bd..4e23675a 100644
--- a/src/se/leap/leapclient/EIP.java
+++ b/src/se/leap/leapclient/EIP.java
@@ -24,7 +24,6 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.IBinder;
import android.os.ResultReceiver;
@@ -39,23 +38,18 @@ public final class EIP extends IntentService {
public final static String ACTION_START_EIP = "se.leap.leapclient.START_EIP";
public final static String ACTION_STOP_EIP = "se.leap.leapclient.STOP_EIP";
public final static String ACTION_UPDATE_EIP_SERVICE = "se.leap.leapclient.UPDATE_EIP_SERVICE";
-
public final static String ACTION_IS_EIP_RUNNING = "se.leap.leapclient.IS_RUNNING";
-
public final static String EIP_NOTIFICATION = "EIP_NOTIFICATION";
private static Context context;
private static ResultReceiver mReceiver;
- // Binder to OpenVpnService for comm ops
private static OpenVpnService mVpnService;
private static boolean mBound = false;
// Used to store actions to "resume" onServiceConnection
private static String mPending = null;
- // Represents our Provider's eip-service.json
private static JSONObject eipDefinition = null;
- // Our active gateway
private static OVPNGateway activeGateway = null;
public EIP(){
@@ -68,7 +62,6 @@ public final class EIP extends IntentService {
context = getApplicationContext();
- // Inflate our eip-service.json data
try {
eipDefinition = ConfigHelper.getJsonFromSharedPref(ConfigHelper.EIP_SERVICE_KEY);
} catch (JSONException e) {
@@ -89,9 +82,7 @@ public final class EIP extends IntentService {
@Override
protected void onHandleIntent(Intent intent) {
- // Get our action from the Intent
String action = intent.getAction();
- // Get the ResultReceiver, if any
mReceiver = intent.getParcelableExtra(ConfigHelper.RECEIVER_TAG);
if ( action == ACTION_IS_EIP_RUNNING )
@@ -187,7 +178,6 @@ public final class EIP extends IntentService {
// TODO Auto-generated catch block
e.printStackTrace();
}
- // Bind OpenVpnService for comm ops
if (!mBound){
mPending = ACTION_START_EIP;
this.retreiveVpnService();
@@ -201,21 +191,8 @@ public final class EIP extends IntentService {
}
private void stopEIP() {
- if (mBound){
+ if (mBound)
mVpnService.onRevoke();
-
- /*if (mReceiver != null){
- Bundle resultData = new Bundle();
- resultData.putString(ConfigHelper.REQUEST_TAG, ACTION_STOP_EIP);
- mReceiver.send(Activity.RESULT_OK, resultData);
- }*/
- } else {
- // TODO If OpenVpnService isn't bound, does that really always mean it's not running?
- // If it's not running, bindService doesn't work w/o START_SERVICE action, so...
- /*mPending = ACTION_STOP_EIP;
- this.retreiveVpnService();*/
- }
- // Remove this if above comes back
if (mReceiver != null){
Bundle resultData = new Bundle();
resultData.putString(ConfigHelper.REQUEST_TAG, ACTION_STOP_EIP);
@@ -242,7 +219,6 @@ public final class EIP extends IntentService {
private void updateGateways(){
JSONArray gatewaysDefined = null;
- // Get our list of gateways
try {
gatewaysDefined = eipDefinition.getJSONArray("gateways");
} catch (JSONException e1) {
@@ -250,7 +226,6 @@ public final class EIP extends IntentService {
e1.printStackTrace();
}
- // Walk the list of gateways and inflate them to VPNProfiles
for ( int i=0 ; i < gatewaysDefined.length(); i++ ){
JSONObject gw = null;
@@ -264,7 +239,6 @@ public final class EIP extends IntentService {
try {
if ( gw.getJSONObject("capabilities").getJSONArray("transport").toString().contains("openvpn") ){
- // We have an openvpn gateway!
// Now build VPNProfiles and save their UUIDs
// TODO create multiple profiles for each gateway to allow trying e.g. different ports when connections don't complete
new OVPNGateway(gw);
@@ -278,14 +252,10 @@ public final class EIP extends IntentService {
private class OVPNGateway {
- // Log tag
private String TAG = "OVPNGateway";
- // The actual VPN Profile object
private VpnProfile mVpnProfile;
- // Our gateway definition from eip-service.json
private JSONObject gateway;
- // This holds our OpenVPN options for creating the VPNProfile
// Options get put here in the form that se.leap.openvpn.ConfigParser wants TODO will be gone w/ rewrite
private HashMap<String,Vector<Vector<String>>> options = new HashMap<String, Vector<Vector<String>>>();
@@ -304,12 +274,7 @@ public final class EIP extends IntentService {
mVpnProfile = vpl.getProfileByName(name);
} catch (NoSuchElementException e) {
-
- // The gateway we were looking for is not in ProfileList!
updateEIPService();
-
- // TODO prompt user to fix config error
-
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -325,7 +290,6 @@ public final class EIP extends IntentService {
// Delete VpnProfile for host, if there already is one
// FIXME There is a better way to check settings and update them, instead of destroy/rebuild
// Also, this allows one gateway per hostname entry, so that had better be true from the server!
- // TODO Will we define multiple gateways per host, for variable options? or change how .openvpn.VpnProfile works?
ProfileManager vpl = ProfileManager.getInstance(context);
Collection<VpnProfile> profiles = vpl.getProfiles();
for (VpnProfile p : profiles){
@@ -338,11 +302,8 @@ public final class EIP extends IntentService {
}
}
- // Create options HashMap for se.leap.openvpn.ConfigParser
this.parseOptions();
- // Now create the VPNProfile
this.createVPNProfile();
- // Now let's save it in the .openvpn package way
setUniqueProfileName(vpl);
vpl.addProfile(mVpnProfile);
@@ -415,10 +376,6 @@ public final class EIP extends IntentService {
e.printStackTrace();
}
- // Now our gateway-specific options
- // to hold 'em the way they're wanted for parsing
-
- // remote:ip_address
try {
arg.add("remote");
arg.add(gateway.getString(remote));
@@ -431,7 +388,6 @@ public final class EIP extends IntentService {
arg.clear();
args.clear();
- // proto:udp||tcp
JSONArray protocolsJSON = null;
arg.add("proto");
try {
@@ -453,7 +409,6 @@ public final class EIP extends IntentService {
args.clear();
- // Now ports...picking one 'cause i say so'... TODO we should have multiple profiles?...
String port = null;
arg.add("port");
try {