Anon certificate is downloaded if possible.

I download the anon certificate only if allow_anonymous is true, and
before launching Dashboard.

I store it in SharedPreferences, with "cert" key, as a JSON object.

1 files changed, 38 insertions, 1 deletions

diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index 78ac0462..fff155a8 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -73,7 +73,6 @@ public class ConfigurationWizard extends Activity
 		}

 		else if(resultCode == ConfigHelper.CORRECTLY_DOWNLOADED_JSON_FILES) {

         	setResult(RESULT_OK);

-        	finish();

 		}

 		else if(resultCode == ConfigHelper.INCORRECTLY_DOWNLOADED_JSON_FILES) {

         	setResult(RESULT_CANCELED);

@@ -86,6 +85,7 @@ public class ConfigurationWizard extends Activity
 				boolean danger_on = resultData.getBoolean(ConfigHelper.DANGER_ON);

 				ConfigHelper.saveSharedPref(ConfigHelper.PROVIDER_KEY, provider_json);

 				ConfigHelper.saveSharedPref(ConfigHelper.DANGER_ON, new JSONObject().put(ConfigHelper.DANGER_ON, danger_on));

+				downloadAnonCert();

 			} catch (JSONException e) {

 				// TODO Auto-generated catch block

 				e.printStackTrace();

@@ -94,6 +94,14 @@ public class ConfigurationWizard extends Activity
 		else if(resultCode == ConfigHelper.INCORRECTLY_UPDATED_PROVIDER_DOT_JSON) {

 			Toast.makeText(getApplicationContext(), "Install a new version of this app.", Toast.LENGTH_LONG).show();

 		}

+		else if(resultCode == ConfigHelper.CORRECTLY_DOWNLOADED_CERTIFICATE) {

+        	setResult(RESULT_OK);

+			Toast.makeText(getApplicationContext(), "Your anon cert has been correctly downloaded", Toast.LENGTH_LONG).show();

+        	finish();

+		} else if(resultCode == ConfigHelper.INCORRECTLY_DOWNLOADED_CERTIFICATE) {

+        	setResult(RESULT_CANCELED);

+			Toast.makeText(getApplicationContext(), "Your anon cert was not downloaded", Toast.LENGTH_LONG).show();

+		}

 	}

 

 	/**

@@ -155,7 +163,9 @@ public class ConfigurationWizard extends Activity
     			provider_contents = new Scanner(ConfigHelper.openFileInputStream(current_provider_item.provider_json_filename)).useDelimiter("\\A").next();

     			provider_json = new JSONObject(provider_contents);

     			ConfigHelper.saveSharedPref(ConfigHelper.PROVIDER_KEY, provider_json);

+    			ConfigHelper.saveSharedPref(ConfigHelper.ALLOWED_ANON, new JSONObject().put(ConfigHelper.ALLOWED_ANON, provider_json.getJSONObject(ConfigHelper.SERVICE_KEY).getBoolean(ConfigHelper.ALLOWED_ANON)));

     			ConfigHelper.saveSharedPref(ConfigHelper.DANGER_ON, new JSONObject().put(ConfigHelper.DANGER_ON, current_provider_item.danger_on));

+				downloadAnonCert();

     			return true;

     		}

     	} catch (JSONException e) {

@@ -182,6 +192,33 @@ public class ConfigurationWizard extends Activity
 		startService(provider_API_command);

 	}

 	

+	private boolean downloadAnonCert() {

+

+		JSONObject allowed_anon;

+		try {

+			allowed_anon = new JSONObject(ConfigHelper.getStringFromSharedPref(ConfigHelper.ALLOWED_ANON));

+			if(allowed_anon.getBoolean(ConfigHelper.ALLOWED_ANON)) {

+				providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());

+				providerAPI_result_receiver.setReceiver(this);

+				

+				Intent provider_API_command = new Intent(this, ProviderAPI.class);

+				

+				Bundle method_and_parameters = new Bundle();

+				

+				method_and_parameters.putString(ConfigHelper.TYPE_OF_CERTIFICATE, ConfigHelper.ANON_CERTIFICATE);

+				

+				provider_API_command.putExtra(ConfigHelper.DOWNLOAD_CERTIFICATE, method_and_parameters);

+				provider_API_command.putExtra("receiver", providerAPI_result_receiver);

+

+				startService(provider_API_command);

+				return true;

+			} else {

+				return false;

+			}

+		} catch (JSONException e) {

+			return false;

+		}

+	}

 	public void addNewProvider(View view) {

 		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

 	    Fragment previous_new_provider_dialog = getFragmentManager().findFragmentByTag(ConfigHelper.NEW_PROVIDER_DIALOG);