Refactoring a bit, things begin to make more sense

Smaller methods, simplified logic, eip status and eip progress still
need some fixes.

3 files changed, 104 insertions, 71 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 117e45d8..8aa09de5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -33,6 +33,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
@@ -63,6 +64,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
     public static final String PARAMETERS = "dashboard parameters";
     public static final String START_ON_BOOT = "dashboard start on boot";
     final public static String ON_BOOT = "dashboard on boot";
+    public static final String APP_VERSION = "bitmask version";
 
 	
 	private ProgressBar mProgressBar;
@@ -81,7 +83,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
-		app = this;
+		app = this;		
 		
 		PRNGFixes.apply();
 	//	mProgressBar = (ProgressBar) findViewById(R.id.progressbar_dashboard);
@@ -91,7 +93,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
 	    
 	    preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
-
+	    handleVersion();
+	    
 	    authed_eip = preferences.getBoolean(EIP.AUTHED_EIP, false);
 		if (preferences.getString(Provider.KEY, "").isEmpty())
 			startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP);
@@ -99,8 +102,22 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		    buildDashboard(getIntent().getBooleanExtra(ON_BOOT, false));
 	}
 
+    private void handleVersion() {
+	try {
+	    int versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
+	    int lastDetectedVersion = preferences.getInt(APP_VERSION, 0);
+	    if(lastDetectedVersion == 0) // New install
+		getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putInt(APP_VERSION, versionCode);
+	    else if(lastDetectedVersion < versionCode) {
+		preferences.edit().remove(EIP.STATUS).commit();
+	    }		    
+	} catch (NameNotFoundException e) {
+	}
+    }
+
 	@Override
 	protected void onDestroy() {
+	    
 		super.onDestroy();
 	}
 
@@ -177,8 +194,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		FragmentManager fragMan = getFragmentManager();
 		if ( provider.hasEIP()){
 			EipServiceFragment eipFragment = new EipServiceFragment();
-			if (hide_and_turn_on_eip) {		    
-			    getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().remove(Dashboard.START_ON_BOOT).commit();			
+			if (hide_and_turn_on_eip) {
+			    getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().remove(Dashboard.START_ON_BOOT).commit();
 			    Bundle arguments = new Bundle();
 			    arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
 			    eipFragment.setArguments(arguments);
@@ -238,10 +255,10 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 			if (Provider.getInstance().hasEIP()){
 				if (getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getBoolean(EIP.AUTHED_EIP, false)){
 					logOut();
-				}
+				}				
 				eipStop();
 			}
-			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().remove(Provider.KEY).commit();
+			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().clear();
 			startActivityForResult(new Intent(this,ConfigurationWizard.class), SWITCH_PROVIDER);
 			return true;
 		case R.id.login_button:
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 7374d5ed..07bc7f9a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -207,6 +207,7 @@ public final class EIP extends IntentService {
 		    Intent disconnect_vpn = new Intent(this, DisconnectVPN.class);
 		    disconnect_vpn.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		    startActivity(disconnect_vpn);
+		    // getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().remove(EIP.STATUS).commit();
 		}
 
 		if (mReceiver != null){
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index 0e3f41d7..04cf18b2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -41,7 +41,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	private TextView eipStatus;
 
 	// private boolean eipAutoSwitched = true;
-	
+    
  	private boolean mEipStartPending = false;
 
     private static EIPReceiver mEIPReceiver;
@@ -91,6 +91,10 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 		VpnStatus.addStateListener(this);
 		
 		eipCommand(EIP.ACTION_CHECK_CERT_VALIDITY);
+		
+		if(isEipConnected()) {
+		    eipSwitch.setChecked(true);
+		}
 	}
     
 	@Override
@@ -116,72 +120,70 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	if(getActivity() != null)
 	    getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().putBoolean(Dashboard.START_ON_BOOT, eip_is_on).commit();
     }
-	@Override
-	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-	    if (buttonView.equals(eipSwitch) // && !eipAutoSwitched
-		){
-		    boolean allowed_anon = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getBoolean(EIP.ALLOWED_ANON, false);
-		    String certificate = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getString(EIP.CERTIFICATE, "");
-		    Log.d(TAG, "allowed_anon = " + allowed_anon + " certificate.isEmpty = " + certificate.isEmpty());
-		    if(allowed_anon || !certificate.isEmpty()) {
-			Log.d(TAG, "switched.isChecked() = " + isChecked);
-			if (isChecked && !mEipStartPending){
-			    startEipFromScratch();
-			} else {
-			    Log.d(TAG, "mEipStartPending = " + mEipStartPending);
-				if (mEipStartPending){
-				    AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity());
-				    alertBuilder.setTitle(getResources().getString(R.string.eip_cancel_connect_title))
-					.setMessage(getResources().getString(R.string.eip_cancel_connect_text))
-					.setPositiveButton(getResources().getString(R.string.eip_cancel_connect_cancel), new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-						    eipCommand(EIP.ACTION_STOP_EIP);
-						    mEipStartPending = false;
-						}
-					    })
-					.setNegativeButton(getResources().getString(R.string.eip_cancel_connect_false), new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
-						    // eipAutoSwitched = true;
-						    // eipSwitch.setChecked(true);
-						    // eipAutoSwitched = false;
-						}
-					    })
-					.show();
-				} else {
-				    eipCommand(EIP.ACTION_STOP_EIP);
-				}
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+	if (buttonView.equals(eipSwitch)){
+	    handleEipSwitch(isChecked);
+	}
+    }
+
+    private boolean isAllowedAnon() {
+	return getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getBoolean(EIP.ALLOWED_ANON, false);
+    }
+    private boolean isEipConnected() {
+	return getEIPString(EIP.STATUS).equalsIgnoreCase("LEVEL_CONNECTED");
+    }
+    private String getEIPString(String feature) {
+	return getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getString(feature, "");
+    }
+
+    private boolean canStartEIP() {
+	return (isAllowedAnon() || !getEIPString(EIP.CERTIFICATE).isEmpty()) && !mEipStartPending && !isEipConnected();
+    }
+    
+    private void handleEipSwitch(boolean isChecked) {
+	if(isChecked) {
+	    handleEipSwitchOn();
+	} else {
+	    handleEipSwitchOff();
+	}
+	saveEipStatus();
+    }
+
+    private void handleEipSwitchOn() {
+	if(canStartEIP()) {
+	    startEipFromScratch();
+	}
+    }
+
+    private void handleEipSwitchOff() {
+	if(mEipStartPending) {
+	    AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity());
+	    alertBuilder.setTitle(getResources().getString(R.string.eip_cancel_connect_title))
+		.setMessage(getResources().getString(R.string.eip_cancel_connect_text))
+		.setPositiveButton((R.string.eip_cancel_connect_cancel), new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+			    stopEIP();
 			}
-		    }
-		    else {
-			Dashboard dashboard = (Dashboard)getActivity();
-			Bundle waiting_on_login = new Bundle();
-			waiting_on_login.putBoolean(IS_EIP_PENDING, true);
-			dashboard.logInDialog(getActivity().getCurrentFocus(), waiting_on_login);
-		    }
-		}
-		else {
-		    Log.d(TAG, "switched.isChecked() = " + isChecked);
-		    if(!isChecked) {
-			if(getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getString(EIP.STATUS, "").equalsIgnoreCase(ConnectionStatus.LEVEL_AUTH_FAILED.toString()))
-			    startEipFromScratch();
-			else
-			    eipStatus.setText(R.string.state_noprocess);
+		    })
+		.setNegativeButton(getResources().getString(R.string.eip_cancel_connect_cancel), new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+			    eipSwitch.setChecked(true);
 			}
-		    else {
-			eipCommand(EIP.ACTION_STOP_EIP);
-		    }
-		}
-		// eipAutoSwitched = true;
-		saveEipStatus();
+		    })
+		.show();
+	} else if(isEipConnected()) {
+	    Log.d(TAG, "Stopping EIP");
+	    stopEIP();
 	}
-	
+    }
 
     public void startEipFromScratch() {
 	mEipStartPending = true;
 	    eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
-	    ((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending);
+	    eipStatus.setText(R.string.eip_status_start_pending);
 	
 	if(!eipSwitch.isChecked()) {
 	    eipSwitch.setChecked(true);	
@@ -189,6 +191,16 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	}
 	eipCommand(EIP.ACTION_START_EIP);
     }
+
+    private void stopEIP() {
+	mEipStartPending = false;
+	View eipProgressBar = getActivity().findViewById(R.id.eipProgress);
+	if(eipProgressBar != null)
+	    eipProgressBar.setVisibility(View.GONE);
+	if(eipStatus != null)
+	    eipStatus.setText(R.string.eip_state_not_connected);
+	eipCommand(EIP.ACTION_STOP_EIP);
+    }
 	
 	/**
 	 * Send a command to EIP
@@ -219,12 +231,13 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 					if (level == ConnectionStatus.LEVEL_CONNECTED){
 						statusMessage = getString(R.string.eip_state_connected);
 						getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE);
-						// mEipStartPending = false;
-					} else if ( level == ConnectionStatus.LEVEL_NONETWORK || level == ConnectionStatus.LEVEL_NOTCONNECTED || level == ConnectionStatus.LEVEL_AUTH_FAILED) {
+						mEipStartPending = false; //TODO This should be done in the onReceiveResult from START_EIP command, but right now LaunchVPN isn't notifying anybody the resultcode of the request so we need to listen the states with this listener.
+					} else if ( (level == ConnectionStatus.LEVEL_NONETWORK || level == ConnectionStatus.LEVEL_NOTCONNECTED || level == ConnectionStatus.LEVEL_AUTH_FAILED) && !mEipStartPending) {
+					    Log.d(TAG, "Not connected updated state");
 						statusMessage = getString(R.string.eip_state_not_connected);
 						if(getActivity() != null && getActivity().findViewById(R.id.eipProgress) != null)
 						    getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE);
-						// mEipStartPending = false;
+						mEipStartPending = false; //TODO See above
 						switchState = false;
 					} else if (level == ConnectionStatus.LEVEL_CONNECTING_SERVER_REPLIED) {
 					    if(state.equals("AUTH") || state.equals("GET_CONFIG"))
@@ -273,8 +286,10 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 			} else if (request == EIP.ACTION_START_EIP) {
 				switch (resultCode){
 				case Activity.RESULT_OK:
+				    Log.d(TAG, "Action start eip = Result OK");
 					checked = true;
 					eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
+					mEipStartPending = false;
 					break;
 				case Activity.RESULT_CANCELED:
 					checked = false;
@@ -341,7 +356,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 
     public void checkEipSwitch(boolean checked) {
 	eipSwitch.setChecked(checked);
-	Log.d(TAG, "checkEipSwitch");
-	onCheckedChanged(eipSwitch, checked);
+	// Log.d(TAG, "checkEipSwitch");
+	// onCheckedChanged(eipSwitch, checked);
     }
 }