1 files changed, 134 insertions, 145 deletions

diff --git a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
index af8a5d46..0ed0f0ba 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -28,7 +28,7 @@ import java.net.*;
 import java.util.*;
 
 import butterknife.*;
-
+import org.jetbrains.annotations.NotNull;
 import org.json.*;
 
 import javax.inject.Inject;
@@ -82,6 +82,14 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
     private String progressbar_text = "";
     private String provider_name = "";
     private int progress = -1;
+
+    private void initProviderList() {
+        List<Renderer<Provider>> prototypes = new ArrayList<Renderer<Provider>>();
+        prototypes.add(new ProviderRenderer(this));
+        ProviderRendererBuilder providerRendererBuilder = new ProviderRendererBuilder(prototypes);
+        adapter = new ProviderListAdapter(getLayoutInflater(), providerRendererBuilder, provider_manager);
+        provider_list_view.setAdapter(adapter);
+    }
     
     @Override
     protected void onSaveInstanceState(Bundle outState) {
@@ -101,13 +109,13 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);
 	fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
         provider_manager = ProviderManager.getInstance(getAssets(), getExternalFilesDir(null));
-
-	setUpProviderList();
 	
 	setUpInitialUI();
 
 	setUpProviderAPIResultReceiver();
 
+	setUpProviderList();
+
 	if ( savedInstanceState != null ) {
 	    restoreState(savedInstanceState);
 	}
@@ -127,7 +135,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
         super.onPostResume();
         if(!progressbar_text.isEmpty() && !provider_name.isEmpty() && progress != -1) {
             progressbar_description.setText(progressbar_text);
-            //onItemSelectedUi(getProvider(provider_name));
             mProgressBar.setProgress(progress);
 
             progressbar_text = "";
@@ -139,7 +146,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
     private void setUpInitialUI() {
 	setContentView(R.layout.configuration_wizard_activity);
         ButterKnife.inject(this);
-        provider_list_view.setAdapter(adapter);
 	
 	hideProgressBar();
     }
@@ -157,7 +163,8 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
     @Override
     protected void onDestroy() {
 	super.onDestroy();
-	unregisterReceiver(providerAPI_broadcast_receiver_update);
+	if(providerAPI_broadcast_receiver_update != null)
+	    unregisterReceiver(providerAPI_broadcast_receiver_update);
     }
 
     private void setUpProviderAPIResultReceiver() {
@@ -169,13 +176,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	update_intent_filter.addCategory(Intent.CATEGORY_DEFAULT);
 	registerReceiver(providerAPI_broadcast_receiver_update, update_intent_filter);
     }
-
-    private void initProviderList() {
-        List<Renderer<Provider>> prototypes = new ArrayList<Renderer<Provider>>();
-        prototypes.add(new ProviderRenderer(this));
-        ProviderRendererBuilder providerRendererBuilder = new ProviderRendererBuilder(prototypes);
-        adapter = new ProviderListAdapter(getLayoutInflater(), providerRendererBuilder, provider_manager);
-    }
     
     @Override
     public void onReceiveResult(int resultCode, Bundle resultData) {
@@ -260,24 +260,20 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	mProgressBar.setVisibility(ProgressBar.GONE);
 	mProgressBar.setProgress(0);
 	progressbar_description.setVisibility(TextView.GONE);
-	
-	preferences.edit().remove(Provider.KEY).apply();
-    	setting_up_provider = false;
-	showAllProviders();
+
+	cancelSettingUpProvider();
     }
     
-    private void usualBackButton() {
-	if(preferences.getString(Provider.KEY, "").isEmpty()) {
-	    askDashboardToQuitApp();
-	} else {
-	    setResult(RESULT_OK);
-	}
-	super.onBackPressed();
+    public void cancelSettingUpProvider() {
+	adapter.showAllProviders();
+	setting_up_provider = false;
+	preferences.edit().remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).apply();
     }
+    
     private void askDashboardToQuitApp() {
-		Intent ask_quit = new Intent();
-		ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);
-		setResult(RESULT_CANCELED, ask_quit);
+	Intent ask_quit = new Intent();
+	ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);
+	setResult(RESULT_CANCELED, ask_quit);
     }
 	
     private void startProgressBar() {
@@ -309,71 +305,71 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
         return listItem.getMeasuredHeight();
     }
     
-	/**
-	 * Asks ProviderAPI to download an anonymous (anon) VPN certificate.
-	 */
-	private void downloadAnonCert() {
-		Intent provider_API_command = new Intent(this, ProviderAPI.class);
+    /**
+     * Asks ProviderAPI to download an anonymous (anon) VPN certificate.
+     */
+    private void downloadAnonCert() {
+	Intent provider_API_command = new Intent(this, ProviderAPI.class);
 
-		Bundle parameters = new Bundle();
+	Bundle parameters = new Bundle();
 
-		parameters.putString(TYPE_OF_CERTIFICATE, ANON_CERTIFICATE);
+	parameters.putString(TYPE_OF_CERTIFICATE, ANON_CERTIFICATE);
 
-		provider_API_command.setAction(ProviderAPI.DOWNLOAD_CERTIFICATE);
-		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
-		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+	provider_API_command.setAction(ProviderAPI.DOWNLOAD_CERTIFICATE);
+	provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
+	provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
 
-		startService(provider_API_command);
-	}
+	startService(provider_API_command);
+    }
 	
-	/**
-	 * Open the new provider dialog
-	 */
-	public void addAndSelectNewProvider() {
-	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
+    /**
+     * Open the new provider dialog
+     */
+    public void addAndSelectNewProvider() {
+	FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
         new NewProviderDialog().show(fragment_transaction, NewProviderDialog.TAG);
-	}
+    }
 	
-	/**
-	 * Open the new provider dialog with data
-	 */
-	public void addAndSelectNewProvider(String main_url) {
-	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
+    /**
+     * Open the new provider dialog with data
+     */
+    public void addAndSelectNewProvider(String main_url) {
+	FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
 		
-	    DialogFragment newFragment = new NewProviderDialog();
-	    Bundle data = new Bundle();
-	    data.putString(Provider.MAIN_URL, main_url);
-	    newFragment.setArguments(data);
-	    newFragment.show(fragment_transaction, NewProviderDialog.TAG);
-	}
+	DialogFragment newFragment = new NewProviderDialog();
+	Bundle data = new Bundle();
+	data.putString(Provider.MAIN_URL, main_url);
+	newFragment.setArguments(data);
+	newFragment.show(fragment_transaction, NewProviderDialog.TAG);
+    }
 	
-	/**
-	 * Once selected a provider, this fragment offers the user to log in, 
-	 * use it anonymously (if possible) 
-	 * or cancel his/her election pressing the back button.
-	 * @param reason_to_fail 
-	 */
-	public void showDownloadFailedDialog(String reason_to_fail) {
-	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(DownloadFailedDialog.TAG);
+    /**
+     * Once selected a provider, this fragment offers the user to log in, 
+     * use it anonymously (if possible) 
+     * or cancel his/her election pressing the back button.
+     * @param reason_to_fail 
+     */
+    public void showDownloadFailedDialog(String reason_to_fail) {
+	FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(DownloadFailedDialog.TAG);
 		
-	    DialogFragment newFragment = DownloadFailedDialog.newInstance(reason_to_fail);
-	    newFragment.show(fragment_transaction, DownloadFailedDialog.TAG);
-	}
+	DialogFragment newFragment = DownloadFailedDialog.newInstance(reason_to_fail);
+	newFragment.show(fragment_transaction, DownloadFailedDialog.TAG);
+    }
 	
-	/**
-	 * Once selected a provider, this fragment offers the user to log in, 
-	 * use it anonymously (if possible) 
-	 * or cancel his/her election pressing the back button.
-	 * @param view
-	 */
-	private void showProviderDetails() {
-		if(setting_up_provider) {
-		    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(ProviderDetailFragment.TAG);
-
-		    DialogFragment newFragment = ProviderDetailFragment.newInstance();
-		    newFragment.show(fragment_transaction, ProviderDetailFragment.TAG);
-		}
+    /**
+     * Once selected a provider, this fragment offers the user to log in, 
+     * use it anonymously (if possible) 
+     * or cancel his/her election pressing the back button.
+     * @param view
+     */
+    private void showProviderDetails() {
+	if(setting_up_provider) {
+	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(ProviderDetailFragment.TAG);
+
+	    DialogFragment newFragment = ProviderDetailFragment.newInstance();
+	    newFragment.show(fragment_transaction, ProviderDetailFragment.TAG);
 	}
+    }
 
     public void showAndSelectProvider(String provider_main_url) {
 	try {
@@ -392,77 +388,71 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	onItemSelectedLogic(selected_provider);
     }
 	
-	/**
-	 * Asks ProviderAPI to download a new provider.json file
-	 * @param provider_name
-	 * @param provider_main_url
-	 */
-	public void setUpProvider(URL provider_main_url) {
-		Intent provider_API_command = new Intent(this, ProviderAPI.class);
-		Bundle parameters = new Bundle();
-		parameters.putString(Provider.MAIN_URL, provider_main_url.toString());
-
-		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);
-
-		startService(provider_API_command);
-		setting_up_provider = true;
-	}
+    /**
+     * Asks ProviderAPI to download a new provider.json file
+     * @param provider_name
+     * @param provider_main_url
+     */
+    public void setUpProvider(URL provider_main_url) {
+	Intent provider_API_command = new Intent(this, ProviderAPI.class);
+	Bundle parameters = new Bundle();
+	parameters.putString(Provider.MAIN_URL, provider_main_url.toString());
+
+	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);
+
+	startService(provider_API_command);
+	setting_up_provider = true;
+    }
 
-	public void retrySetUpProvider() {
-		cancelSettingUpProvider();
-		if(!ProviderAPI.caCertDownloaded()) {
-			addAndSelectNewProvider(ProviderAPI.lastProviderMainUrl());
-		} else {
-			Intent provider_API_command = new Intent(this, ProviderAPI.class);
+    public void retrySetUpProvider() {
+	cancelSettingUpProvider();
+	if(!ProviderAPI.caCertDownloaded()) {
+	    addAndSelectNewProvider(ProviderAPI.lastProviderMainUrl());
+	} else {
+	    Intent provider_API_command = new Intent(this, ProviderAPI.class);
 
-			provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
-			provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+	    provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
+	    provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
 
-			startService(provider_API_command);
-		}
-	}
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);
-		return true;
+	    startService(provider_API_command);
 	}
+    }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+	getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);
+	return true;
+    }
 	
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item){
-		switch (item.getItemId()){
-		case R.id.about_leap:
-		    startActivityForResult(new Intent(this, AboutActivity.class), 0);
-			return true;
-		case R.id.new_provider:
-			addAndSelectNewProvider();
-			return true;
-		default:
-			return super.onOptionsItemSelected(item);
-		}
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item){
+	switch (item.getItemId()){
+	case R.id.about_leap:
+	    startActivityForResult(new Intent(this, AboutActivity.class), 0);
+	    return true;
+	case R.id.new_provider:
+	    addAndSelectNewProvider();
+	    return true;
+	default:
+	    return super.onOptionsItemSelected(item);
 	}
+    }
 		
     public void showAllProviders() {
 	adapter.showAllProviders();
     }
-	
-    public void cancelSettingUpProvider() {
-	adapter.showAllProviders();
+
+    @Override
+    public void login() {
+	Intent ask_login = new Intent();
+	ask_login.putExtra(Provider.KEY, selected_provider);
+	ask_login.putExtra(SessionDialog.TAG, SessionDialog.TAG);
+	setResult(RESULT_OK, ask_login);
 	setting_up_provider = false;
-	preferences.edit().remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).apply();
+	finish();
     }
 
-	@Override
-	public void login() {
-		Intent ask_login = new Intent();
-		ask_login.putExtra(Provider.KEY, selected_provider);
-		ask_login.putExtra(SessionDialog.TAG, SessionDialog.TAG);
-		setResult(RESULT_OK, ask_login);
-		setting_up_provider = false;
-		finish();
-	}
-
     @Override
     public void use_anonymously() {
 	Intent pass_provider = new Intent();
@@ -472,12 +462,11 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	finish();
     }
 
-	public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver {
-
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			int update = intent.getIntExtra(ProviderAPI.CURRENT_PROGRESS, 0);
-			mProgressBar.setProgress(update);
-		}
+    public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver {
+	@Override
+	public void onReceive(Context context, Intent intent) {
+	    int update = intent.getIntExtra(ProviderAPI.CURRENT_PROGRESS, 0);
+	    mProgressBar.setProgress(update);
 	}
+    }
 }