Back button while setting up a provider works

It stops the process, you can restart it as usual, but if you press back
again you quit the app because there is no chosen provider.

3 files changed, 95 insertions, 64 deletions

diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java
index 1c5f6048..1c0c1ad2 100644
--- a/src/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -84,9 +84,10 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 	final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";

     

     public ProviderAPIResultReceiver providerAPI_result_receiver;

-    private ProviderAPIBroadcastReceiver_Update providerAPI_broadcast_receiver_update;

+    private ProviderAPIBroadcastReceiver_Update providerAPI_broadcast_receiver_update;
 
-    private static SharedPreferences preferences;
+    private static SharedPreferences preferences;

+    private static boolean setting_up_provider = false;
     

     @Override

     protected void onCreate(Bundle savedInstanceState) {

@@ -159,6 +160,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 				    mProgressBar.setVisibility(ProgressBar.GONE);

 				    progressbar_description.setVisibility(TextView.GONE);

 					setResult(RESULT_OK);

+					setting_up_provider = false;
 					showProviderDetails(getCurrentFocus());

 				}
 		} else if(resultCode == ProviderAPI.PROVIDER_NOK) {

@@ -166,8 +168,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 			String reason_to_fail = resultData.getString(ProviderAPI.ERRORS);

 			showDownloadFailedDialog(getCurrentFocus(), reason_to_fail);

 			mProgressBar.setVisibility(ProgressBar.GONE);

-			progressbar_description.setVisibility(TextView.GONE);

-			preferences.edit().remove(Provider.KEY).commit();
+			progressbar_description.setVisibility(TextView.GONE);
+			preferences.edit().remove(Provider.KEY).commit();

+			setting_up_provider = false;
 			setResult(RESULT_CANCELED, mConfigState);

 		}

 		else if(resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {

@@ -212,19 +215,28 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
     

     @Override

     public void onBackPressed() {

-    	try {

-    		boolean is_provider_set_up = new JSONObject(preferences.getString(Provider.KEY, "no provider")) != null ? true : false;

-    		boolean is_provider_set_up_truly = new JSONObject(preferences.getString(Provider.KEY, "no provider")).length() != 0 ? true : false;

-			if(!is_provider_set_up || !is_provider_set_up_truly) {

-				askDashboardToQuitApp();

-			} else {

-				setResult(RESULT_OK);

-			}

-		} catch (JSONException e) {

-			askDashboardToQuitApp();

-		}

+    	if(setting_up_provider) {

+    		ProviderAPI.stop();

+    		mProgressBar.setVisibility(ProgressBar.GONE);

+    		mProgressBar.setProgress(0);

+    		progressbar_description.setVisibility(TextView.GONE);

+    		getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit().remove(Provider.KEY).commit();

+    	} else {
+    		try {

+    			boolean is_provider_set_up = new JSONObject(preferences.getString(Provider.KEY, "no provider")) != null ? true : false;

+    			boolean is_provider_set_up_truly = new JSONObject(preferences.getString(Provider.KEY, "no provider")).length() != 0 ? true : false;

+    			if(!is_provider_set_up || !is_provider_set_up_truly) {

+    				askDashboardToQuitApp();

+    			} else {

+    				setResult(RESULT_OK);

+    			}

+    		} catch (JSONException e) {

+    			askDashboardToQuitApp();

+    		}

+    	}

+    	setting_up_provider = false;

     	super.onBackPressed();

-    }

+    }
     

     private void askDashboardToQuitApp() {

 		Intent ask_quit = new Intent();

@@ -448,9 +460,10 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 

 		provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);

 		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);

-		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);

+		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
 
-		startService(provider_API_command);
+		startService(provider_API_command);

+		setting_up_provider = true;
 	}
 
 	public void retrySetUpProvider() {
@@ -466,7 +479,6 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 			startService(provider_API_command);
 		}
 	}
-	
 	@Override

 	public boolean onCreateOptionsMenu(Menu menu) {

 		getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);

diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java
index 65fd2d5b..aa3cd4d9 100644
--- a/src/se/leap/bitmaskclient/Dashboard.java
+++ b/src/se/leap/bitmaskclient/Dashboard.java
@@ -103,7 +103,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	protected void onActivityResult(int requestCode, int resultCode, 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 ){		
+			if ( resultCode == RESULT_OK ){
 				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putInt(EIP.PARSED_SERIAL, 0).commit();
 				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putBoolean(EIP.AUTHED_EIP, authed_eip).commit();
 				Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
diff --git a/src/se/leap/bitmaskclient/ProviderAPI.java b/src/se/leap/bitmaskclient/ProviderAPI.java
index 7aafa2e3..35eab18e 100644
--- a/src/se/leap/bitmaskclient/ProviderAPI.java
+++ b/src/se/leap/bitmaskclient/ProviderAPI.java
@@ -126,7 +126,12 @@ public class ProviderAPI extends IntentService {
     
     private static String last_provider_main_url;
     private static boolean last_danger_on = false;
+    private static boolean working = true;
     
+    public static void stop() {
+    	working = false;
+    }
+
 	public ProviderAPI() {
 		super("ProviderAPI");
 		Log.v("ClassName", "Provider API");
@@ -156,32 +161,41 @@ public class ProviderAPI extends IntentService {
 		final ResultReceiver receiver = command.getParcelableExtra(RECEIVER_KEY);
 		String action = command.getAction();
 		Bundle parameters = command.getBundleExtra(PARAMETERS);
+		working = true;
 		
 		if(action.equalsIgnoreCase(SET_UP_PROVIDER)) {
 			Bundle result = setUpProvider(parameters);
-			if(result.getBoolean(RESULT_KEY)) {
-				receiver.send(PROVIDER_OK, Bundle.EMPTY);
-			} else { 
-				receiver.send(PROVIDER_NOK, result);
+			if(working) {
+				if(result.getBoolean(RESULT_KEY)) {
+					receiver.send(PROVIDER_OK, result);
+				} else { 
+					receiver.send(PROVIDER_NOK, result);
+				}
 			}
 		} else if (action.equalsIgnoreCase(SRP_AUTH)) {
 			Bundle session_id_bundle = authenticateBySRP(parameters);
-			if(session_id_bundle.getBoolean(RESULT_KEY)) {
-				receiver.send(SRP_AUTHENTICATION_SUCCESSFUL, session_id_bundle);
-			} else {
-				receiver.send(SRP_AUTHENTICATION_FAILED, session_id_bundle);
+			if(working) {
+				if(session_id_bundle.getBoolean(RESULT_KEY)) {
+					receiver.send(SRP_AUTHENTICATION_SUCCESSFUL, session_id_bundle);
+				} else {
+					receiver.send(SRP_AUTHENTICATION_FAILED, session_id_bundle);
+				}
 			}
 		} else if (action.equalsIgnoreCase(LOG_OUT)) {
-			if(logOut(parameters)) {
-				receiver.send(LOGOUT_SUCCESSFUL, Bundle.EMPTY);
-			} else {
-				receiver.send(LOGOUT_FAILED, Bundle.EMPTY);
+			if(working) {
+				if(logOut(parameters)) {
+					receiver.send(LOGOUT_SUCCESSFUL, Bundle.EMPTY);
+				} else {
+					receiver.send(LOGOUT_FAILED, Bundle.EMPTY);
+				}
 			}
 		} else if (action.equalsIgnoreCase(DOWNLOAD_CERTIFICATE)) {
-			if(getNewCert(parameters)) {
-				receiver.send(CORRECTLY_DOWNLOADED_CERTIFICATE, Bundle.EMPTY);
-			} else {
-				receiver.send(INCORRECTLY_DOWNLOADED_CERTIFICATE, Bundle.EMPTY);
+			if(working) {
+				if(getNewCert(parameters)) {
+					receiver.send(CORRECTLY_DOWNLOADED_CERTIFICATE, Bundle.EMPTY);
+				} else {
+					receiver.send(INCORRECTLY_DOWNLOADED_CERTIFICATE, Bundle.EMPTY);
+				}
 			}
 		}
 	}
@@ -477,8 +491,9 @@ public class ProviderAPI extends IntentService {
 	private Bundle downloadCACert(String provider_main_url, boolean danger_on) {
 		Bundle result = new Bundle();
 		String cert_string = downloadWithCommercialCA(provider_main_url + "/ca.crt", danger_on);
+
 	    if(validCertificate(cert_string)) {
-		getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(Provider.CA_CERT, cert_string).commit();
+	    	getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(Provider.CA_CERT, cert_string).commit();
 			result.putBoolean(RESULT_KEY, true);
 		} else {
 			String reason_to_fail = pickErrorMessage(cert_string);
@@ -512,22 +527,24 @@ public class ProviderAPI extends IntentService {
 	private Bundle getAndSetProviderJson(String provider_main_url) {
 		Bundle result = new Bundle();
 
-		String provider_dot_json_string = downloadWithProviderCA(provider_main_url + "/provider.json", true);
+		if(working) {
+			String provider_dot_json_string = downloadWithProviderCA(provider_main_url + "/provider.json", true);
 
-		try {
-			JSONObject provider_json = new JSONObject(provider_dot_json_string);
-			String name = provider_json.getString(Provider.NAME);
-			//TODO setProviderName(name);
-			
-			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(Provider.KEY, provider_json.toString()).commit();
-			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putBoolean(EIP.ALLOWED_ANON, provider_json.getJSONObject(Provider.SERVICE).getBoolean(EIP.ALLOWED_ANON)).commit();
+			try {
+				JSONObject provider_json = new JSONObject(provider_dot_json_string);
+				String name = provider_json.getString(Provider.NAME);
+				//TODO setProviderName(name);
 
-			result.putBoolean(RESULT_KEY, true);
-		} catch (JSONException e) {
-			//TODO Error message should be contained in that provider_dot_json_string
-			String reason_to_fail = pickErrorMessage(provider_dot_json_string);
-			result.putString(ERRORS, reason_to_fail);
-			result.putBoolean(RESULT_KEY, false);
+				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(Provider.KEY, provider_json.toString()).commit();
+				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putBoolean(EIP.ALLOWED_ANON, provider_json.getJSONObject(Provider.SERVICE).getBoolean(EIP.ALLOWED_ANON)).commit();
+
+				result.putBoolean(RESULT_KEY, true);
+			} catch (JSONException e) {
+				//TODO Error message should be contained in that provider_dot_json_string
+				String reason_to_fail = pickErrorMessage(provider_dot_json_string);
+				result.putString(ERRORS, reason_to_fail);
+				result.putBoolean(RESULT_KEY, false);
+			}
 		}
 		return result;
 	}
@@ -541,20 +558,22 @@ public class ProviderAPI extends IntentService {
 	private Bundle getAndSetEipServiceJson() {
 		Bundle result = new Bundle();
 		String eip_service_json_string = "";
-		try {
-			JSONObject provider_json = new JSONObject(getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(Provider.KEY, ""));
-			String eip_service_url = provider_json.getString(Provider.API_URL) +  "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.SERVICE_API_PATH;
-			eip_service_json_string = downloadWithProviderCA(eip_service_url, true);
-			JSONObject eip_service_json = new JSONObject(eip_service_json_string);
-			eip_service_json.getInt(Provider.API_RETURN_SERIAL);
-			
-			getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(EIP.KEY, eip_service_json.toString()).commit();
+		if(working) {
+			try {
+				JSONObject provider_json = new JSONObject(getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(Provider.KEY, ""));
+				String eip_service_url = provider_json.getString(Provider.API_URL) +  "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.SERVICE_API_PATH;
+				eip_service_json_string = downloadWithProviderCA(eip_service_url, true);
+				JSONObject eip_service_json = new JSONObject(eip_service_json_string);
+				eip_service_json.getInt(Provider.API_RETURN_SERIAL);
 
-			result.putBoolean(RESULT_KEY, true);
-		} catch (JSONException e) {
-			String reason_to_fail = pickErrorMessage(eip_service_json_string);
-			result.putString(ERRORS, reason_to_fail);
-			result.putBoolean(RESULT_KEY, false);
+				getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putString(EIP.KEY, eip_service_json.toString()).commit();
+
+				result.putBoolean(RESULT_KEY, true);
+			} catch (JSONException e) {
+				String reason_to_fail = pickErrorMessage(eip_service_json_string);
+				result.putString(ERRORS, reason_to_fail);
+				result.putBoolean(RESULT_KEY, false);
+			}
 		}
 		return result;
 	}