1 files changed, 117 insertions, 120 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 364a79af..8143d8d6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -14,17 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
- package se.leap.bitmaskclient;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
-import se.leap.bitmaskclient.FragmentManagerEnhanced;
-import se.leap.bitmaskclient.SignUpDialog;
-
-import de.blinkt.openvpn.activities.LogWindow;
+package se.leap.bitmaskclient;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -41,11 +31,16 @@ import android.os.ResultReceiver;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import de.blinkt.openvpn.activities.LogWindow;
+import se.leap.bitmaskclient.eip.Constants;
+import se.leap.bitmaskclient.eip.EIP;
+import se.leap.bitmaskclient.eip.EipStatus;
 
 /**
  * The main user facing Activity of LEAP Android, consisting of status, controls,
@@ -54,11 +49,12 @@ import android.widget.Toast;
  * @author Sean Leonard <meanderingcode@aetherislands.net>
  * @author parmegv
  */
-public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface, SignUpDialog.SignUpDialogInterface, Receiver {
+public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface, SignUpDialog.SignUpDialogInterface, ProviderAPIResultReceiver.Receiver {
 
 	protected static final int CONFIGURE_LEAP = 0;
 	protected static final int SWITCH_PROVIDER = 1;
 
+    final public static String TAG = Dashboard.class.getSimpleName();
     final public static String SHARED_PREFERENCES = "LEAPPreferences";
     final public static String ACTION_QUIT = "quit";
     public static final String REQUEST_CODE = "request_code";
@@ -66,21 +62,17 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
     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";
-    final public static String TAG = Dashboard.class.getSimpleName();
-
 
-    private EipServiceFragment eipFragment;
-	private ProgressBar mProgressBar;
-	private TextView eipStatus;
-	private static Context app;
-	protected static SharedPreferences preferences;
-	private static Provider provider;
-
-	private boolean authed_eip = false;
+    private static Context app;
+    protected static SharedPreferences preferences;
+    private FragmentManagerEnhanced fragment_manager;
 
+    private ProgressBar mProgressBar;
+    private TextView status_message;
     public ProviderAPIResultReceiver providerAPI_result_receiver;
-    private FragmentManagerEnhanced fragment_manager;
 
+    private static boolean authed_eip;
+    
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -95,32 +87,33 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
 	    handleVersion();
 	    
-	    authed_eip = preferences.getBoolean(EIP.AUTHED_EIP, false);
-		if (preferences.getString(Provider.KEY, "").isEmpty())
-			startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP);
-		else
-		    buildDashboard(getIntent().getBooleanExtra(ON_BOOT, false));
+	    boolean provider_configured = preferences.getString(Constants.KEY, "").isEmpty();
+	    if (provider_configured)
+		startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP);
+	    else
+		buildDashboard(getIntent().getBooleanExtra(ON_BOOT, false));
 	}
 
     private void handleVersion() {
 	try {
 	    int versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
 	    int lastDetectedVersion = preferences.getInt(APP_VERSION, 0);
-	    preferences.edit().putInt(APP_VERSION, versionCode);
+	    preferences.edit().putInt(APP_VERSION, versionCode).apply();
 	    Log.d("Dashboard", "detected version code: " + versionCode);
 	    Log.d("Dashboard", "last detected version code: " + lastDetectedVersion);
 
 	    switch(versionCode) {
 	    case 91: // 0.6.0 without Bug #5999
 	    case 101: // 0.8.0
-		if(!preferences.getString(EIP.KEY, "").isEmpty()) {
+		if(!preferences.getString(Constants.KEY, "").isEmpty()) {
 		    Intent rebuildVpnProfiles = new Intent(getApplicationContext(), EIP.class);
-		    rebuildVpnProfiles.setAction(EIP.ACTION_REBUILD_PROFILES);
+		    rebuildVpnProfiles.setAction(Constants.ACTION_UPDATE_EIP_SERVICE);
 		    startService(rebuildVpnProfiles);
 		}
 		break;
 	    }
 	} catch (NameNotFoundException e) {
+        Log.d(TAG, "Handle version didn't find any " + getPackageName() + " package");
 	}
     }
 
@@ -134,30 +127,28 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	super.onPause();
     }
     
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, final Intent data){
-		if ( requestCode == CONFIGURE_LEAP || requestCode == SWITCH_PROVIDER) {
-		// It should be equivalent: if ( (requestCode == CONFIGURE_LEAP) || (data!= null && data.hasExtra(STOP_FIRST))) {
-		    if ( resultCode == RESULT_OK ){
-			preferences.edit().putInt(EIP.PARSED_SERIAL, 0).commit();
-			preferences.edit().putBoolean(EIP.AUTHED_EIP, authed_eip).commit();
-				
-			Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
-			updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
-			startService(updateEIP);
-			
-			buildDashboard(false);
-			invalidateOptionsMenu();
-			if(data != null && data.hasExtra(LogInDialog.TAG)) {
-			    View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0);
-			    logInDialog(Bundle.EMPTY);
-			}
-			} else if(resultCode == RESULT_CANCELED && (data == null || data.hasExtra(ACTION_QUIT))) {
-				finish();
-			} else
-				configErrorDialog();
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data){
+	Log.d(TAG, "onActivityResult: requestCode = " + requestCode);
+	if ( requestCode == CONFIGURE_LEAP || requestCode == SWITCH_PROVIDER) {
+	    // It should be equivalent: if ( (requestCode == CONFIGURE_LEAP) || (data!= null && data.hasExtra(STOP_FIRST))) {
+	    if ( resultCode == RESULT_OK ){
+		preferences.edit().putInt(Constants.PARSED_SERIAL, 0).apply();
+		preferences.edit().putBoolean(Constants.AUTHED_EIP, authed_eip).apply();
+		updateEipService();
+		buildDashboard(false);
+		invalidateOptionsMenu();
+		if(data != null && data.hasExtra(LogInDialog.TAG)) {
+		    logInDialog(Bundle.EMPTY);
 		}
+	    } else if(resultCode == RESULT_CANCELED && (data == null || data.hasExtra(ACTION_QUIT))) {
+		finish();
+	    } else
+		configErrorDialog();
+	} else if(requestCode == EIP.DISCONNECT) {
+	    EipStatus.getInstance().setConnectedOrDisconnected();
 	}
+    }
 
 	/**
 	 * Dialog shown when encountering a configuration error.  Such errors require
@@ -178,7 +169,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 			.setNegativeButton(getResources().getString(R.string.setup_error_close_button), new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-				    preferences.edit().remove(Provider.KEY).commit();
+				    preferences.edit().remove(Provider.KEY).apply();
 					finish();
 				}
 			})
@@ -190,7 +181,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	 * service dependent UI elements to include.
 	 */
 	private void buildDashboard(boolean hide_and_turn_on_eip) {
-		provider = Provider.getInstance();
+        Provider provider = Provider.getInstance();
 		provider.init( this );
 
 		setContentView(R.layout.client_dashboard);
@@ -199,21 +190,27 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		providerNameTV.setText(provider.getDomain());
 		providerNameTV.setTextSize(28);
 		
-	    mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
+		mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
 
 		if ( provider.hasEIP()){
-			eipFragment = new EipServiceFragment();
-			if (hide_and_turn_on_eip) {
-			    preferences.edit().remove(Dashboard.START_ON_BOOT).commit();
-			    Bundle arguments = new Bundle();
-			    arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
-			    eipFragment.setArguments(arguments);
-			}
-			fragment_manager.replace(R.id.servicesCollection, eipFragment, EipServiceFragment.TAG);
 
-			if (hide_and_turn_on_eip) {
-			    onBackPressed();
-			}
+            EipServiceFragment eip_fragment = (EipServiceFragment) fragment_manager.findFragmentByTag(EipServiceFragment.TAG);
+            if(eip_fragment == null)
+                eip_fragment = new EipServiceFragment();
+
+		    if (hide_and_turn_on_eip) {
+			preferences.edit().remove(Dashboard.START_ON_BOOT).apply();
+			Bundle arguments = new Bundle();
+			arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
+			eip_fragment.setArguments(arguments);
+		    }
+
+            fragment_manager.removePreviousFragment(EipServiceFragment.TAG);
+            fragment_manager.replace(R.id.servicesCollection, eip_fragment, EipServiceFragment.TAG);
+
+		    if (hide_and_turn_on_eip) {
+			onBackPressed();
+		    }
 		}
 	}
 
@@ -222,12 +219,12 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	JSONObject provider_json;
 	try {
 	    String provider_json_string = preferences.getString(Provider.KEY, "");
-	    if(provider_json_string.isEmpty() == false) {
+	    if(!provider_json_string.isEmpty()) {
 		provider_json = new JSONObject(provider_json_string);
 		JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
 		boolean authed_eip = !LeapSRPSession.getToken().isEmpty();
 		boolean allow_registered_eip = service_description.getBoolean(Provider.ALLOW_REGISTRATION);
-		preferences.edit().putBoolean(EIP.ALLOWED_REGISTERED, allow_registered_eip);
+		preferences.edit().putBoolean(Constants.ALLOWED_REGISTERED, allow_registered_eip).apply();
 		
 		if(allow_registered_eip) {
 		    if(authed_eip) {
@@ -268,12 +265,12 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		    return true;
 		case R.id.switch_provider:
 			if (Provider.getInstance().hasEIP()){
-				if (preferences.getBoolean(EIP.AUTHED_EIP, false)){
+				if (preferences.getBoolean(Constants.AUTHED_EIP, false)){
 					logOut();
 				}				
 				eipStop();
 			}
-			preferences.edit().clear().commit();
+			preferences.edit().clear().apply();
 			startActivityForResult(new Intent(this,ConfigurationWizard.class), SWITCH_PROVIDER);
 			return true;
 		case R.id.login_button:
@@ -293,7 +290,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 
     private Intent prepareProviderAPICommand() {	    
 	mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
-	eipStatus = (TextView) findViewById(R.id.eipStatus);
+	status_message = (TextView) findViewById(R.id.status_message);
 		
 	providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());
 	providerAPI_result_receiver.setReceiver(this);
@@ -327,20 +324,15 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	parameters.putString(SessionDialogInterface.PASSWORD, password);
 
 	mProgressBar.setVisibility(ProgressBar.VISIBLE);
-	eipStatus.setText(R.string.authenticating_message);
+	status_message.setText(R.string.authenticating_message);
 
 	provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
 	provider_API_command.setAction(ProviderAPI.SRP_AUTH);
 	startService(provider_API_command);
     }
 
-    public void cancelAuthedEipOn() {
-	EipServiceFragment eipFragment = (EipServiceFragment) getFragmentManager().findFragmentByTag(EipServiceFragment.TAG);
-	eipFragment.checkEipSwitch(false);
-    }
-
     public void cancelLoginOrSignup() {
-	hideProgressBar();
+      EipStatus.getInstance().setConnectedOrDisconnected();
     }
 	
     /**
@@ -351,8 +343,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    
 	if(mProgressBar == null) mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
 	mProgressBar.setVisibility(ProgressBar.VISIBLE);
-	if(eipStatus == null) eipStatus = (TextView) findViewById(R.id.eipStatus);
-	eipStatus.setText(R.string.logout_message);
+	if(status_message == null) status_message = (TextView) findViewById(R.id.status_message);
+	status_message.setText(R.string.logout_message);
 		
 	provider_API_command.setAction(ProviderAPI.LOG_OUT);
 	startService(provider_API_command);
@@ -382,7 +374,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	parameters.putString(SessionDialogInterface.PASSWORD, password);
 	
 	mProgressBar.setVisibility(ProgressBar.VISIBLE);
-	eipStatus.setText(R.string.signingup_message);
+	status_message.setText(R.string.signingup_message);
 	
 	provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
 	provider_API_command.setAction(ProviderAPI.SRP_REGISTER);
@@ -410,6 +402,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 
 	@Override
 	public void onReceiveResult(int resultCode, Bundle resultData) {
+	    Log.d(TAG, "onReceiveResult");
 	    if(resultCode == ProviderAPI.SRP_REGISTRATION_SUCCESSFUL) {
 		String username = resultData.getString(SessionDialogInterface.USERNAME);
 		String password = resultData.getString(SessionDialogInterface.PASSWORD);
@@ -426,7 +419,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		invalidateOptionsMenu();
 		
 		authed_eip = true;
-		preferences.edit().putBoolean(EIP.AUTHED_EIP, authed_eip).commit();
+		preferences.edit().putBoolean(Constants.AUTHED_EIP, authed_eip).apply();
 
         	downloadAuthedUserCertificate();
 	    } else if(resultCode == ProviderAPI.SRP_AUTHENTICATION_FAILED) {
@@ -441,7 +434,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		invalidateOptionsMenu();
 		
 		authed_eip = false;
-		preferences.edit().putBoolean(EIP.AUTHED_EIP, authed_eip).commit();
+		preferences.edit().putBoolean(Constants.AUTHED_EIP, authed_eip).apply();
 
 	    } else if(resultCode == ProviderAPI.LOGOUT_FAILED) {
 		changeStatusMessage(resultCode);
@@ -453,22 +446,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		hideProgressBar();
 		
         	setResult(RESULT_OK);
-		Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
-		ResultReceiver eip_receiver = new ResultReceiver(new Handler()){
-			protected void onReceiveResult(int resultCode, Bundle resultData){
-			    super.onReceiveResult(resultCode, resultData);
-			    String request = resultData.getString(EIP.REQUEST_TAG);
-			    if (resultCode == Activity.RESULT_OK){
-				if(authed_eip)
-				    eipStart();
-				else
-				    eipStatus.setText("Certificate updated");
-				}
-			    }
-		    };
-		updateEIP.putExtra(EIP.RECEIVER_TAG, eip_receiver);
-		updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
-		startService(updateEIP);
+		
+		updateEipService();
 	    } else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
     		changeStatusMessage(resultCode);
 		hideProgressBar();
@@ -476,23 +455,41 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    }
 	}
 
+    private void updateEipService() {
+	Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
+	updateEIP.setAction(Constants.ACTION_UPDATE_EIP_SERVICE);
+	ResultReceiver receiver = new ResultReceiver(new Handler()) {
+		protected void onReceiveResult(int resultCode, Bundle resultData) {
+		    String request = resultData.getString(Constants.REQUEST_TAG);
+		    if(request.equalsIgnoreCase(Constants.ACTION_UPDATE_EIP_SERVICE)) {
+			if(resultCode == Activity.RESULT_OK) {
+			    if(authed_eip)
+				eipStart();
+			}
+		    }
+		}
+	    };
+	updateEIP.putExtra(Constants.RECEIVER_TAG, receiver);
+	startService(updateEIP);
+    }
+
 	private void changeStatusMessage(final int previous_result_code) {
 		// TODO Auto-generated method stub
 		ResultReceiver eip_status_receiver = new ResultReceiver(new Handler()){
 			protected void onReceiveResult(int resultCode, Bundle resultData){
 				super.onReceiveResult(resultCode, resultData);
-				String request = resultData.getString(EIP.REQUEST_TAG);
-				if(eipStatus == null) eipStatus = (TextView) findViewById(R.id.eipStatus);
-				if (request.equalsIgnoreCase(EIP.ACTION_IS_EIP_RUNNING)){					
+				String request = resultData.getString(Constants.REQUEST_TAG);
+				if(status_message == null) status_message = (TextView) findViewById(R.id.status_message);
+				if (request.equalsIgnoreCase(Constants.ACTION_IS_EIP_RUNNING)){					
 					if (resultCode == Activity.RESULT_OK){
 
 						switch(previous_result_code){
-						case ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL: eipStatus.setText(R.string.succesful_authentication_message); break;
-						case ProviderAPI.SRP_AUTHENTICATION_FAILED: eipStatus.setText(R.string.authentication_failed_message); break;
-						case ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE: eipStatus.setText(R.string.authed_secured_status); break;
-						case ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE: eipStatus.setText(R.string.incorrectly_downloaded_certificate_message); break;
-						case ProviderAPI.LOGOUT_SUCCESSFUL: eipStatus.setText(R.string.logged_out_message); break;
-						case ProviderAPI.LOGOUT_FAILED: eipStatus.setText(R.string.log_out_failed_message); break;
+						case ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL: status_message.setText(R.string.succesful_authentication_message); break;
+						case ProviderAPI.SRP_AUTHENTICATION_FAILED: status_message.setText(R.string.authentication_failed_message); break;
+						case ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE: status_message.setText(R.string.authed_secured_status); break;
+						case ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE: status_message.setText(R.string.incorrectly_downloaded_certificate_message); break;
+						case ProviderAPI.LOGOUT_SUCCESSFUL: status_message.setText(R.string.logged_out_message); break;
+						case ProviderAPI.LOGOUT_FAILED: status_message.setText(R.string.log_out_failed_message); break;
 						
 						}	
 					}
@@ -500,13 +497,13 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 
 						switch(previous_result_code){
 
-						case ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL: eipStatus.setText(R.string.succesful_authentication_message); break;
-						case ProviderAPI.SRP_AUTHENTICATION_FAILED: eipStatus.setText(R.string.authentication_failed_message); break;
-						case ProviderAPI.SRP_REGISTRATION_FAILED: eipStatus.setText(R.string.registration_failed_message); break;
+						case ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL: status_message.setText(R.string.succesful_authentication_message); break;
+						case ProviderAPI.SRP_AUTHENTICATION_FAILED: status_message.setText(R.string.authentication_failed_message); break;
+						case ProviderAPI.SRP_REGISTRATION_FAILED: status_message.setText(R.string.registration_failed_message); break;
 						case ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE: break;
-						case ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE: eipStatus.setText(R.string.incorrectly_downloaded_certificate_message); break;
-						case ProviderAPI.LOGOUT_SUCCESSFUL: eipStatus.setText(R.string.logged_out_message); break;
-						case ProviderAPI.LOGOUT_FAILED: eipStatus.setText(R.string.log_out_failed_message); break;			
+						case ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE: status_message.setText(R.string.incorrectly_downloaded_certificate_message); break;
+						case ProviderAPI.LOGOUT_SUCCESSFUL: status_message.setText(R.string.logged_out_message); break;
+						case ProviderAPI.LOGOUT_FAILED: status_message.setText(R.string.log_out_failed_message); break;			
 						}
 					}
 				}
@@ -544,8 +541,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	private void eipIsRunning(ResultReceiver eip_receiver){
 		// TODO validate "action"...how do we get the list of intent-filters for a class via Android API?
 		Intent eip_intent = new Intent(this, EIP.class);
-		eip_intent.setAction(EIP.ACTION_IS_EIP_RUNNING);
-		eip_intent.putExtra(EIP.RECEIVER_TAG, eip_receiver);
+		eip_intent.setAction(Constants.ACTION_IS_EIP_RUNNING);
+		eip_intent.putExtra(Constants.RECEIVER_TAG, eip_receiver);
 		startService(eip_intent);
 	}