1 files changed, 7 insertions, 21 deletions

diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java
index 2467c52f..cf027660 100644
--- a/src/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -182,7 +182,10 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 		    progressbar_description.setVisibility(TextView.GONE);

 			//Toast.makeText(getApplicationContext(), R.string.incorrectly_downloaded_certificate_message, Toast.LENGTH_LONG).show();

         	setResult(RESULT_CANCELED, mConfigState);

-		}

+		} else if(resultCode == AboutActivity.VIEWED) {
+		    // Do nothing, right now
+		    // I need this for CW to wait for the About activity to end before going back to Dashboard.
+		}
 	}

 

 	/**

@@ -476,9 +479,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 	@Override

 	public boolean onOptionsItemSelected(MenuItem item){

 		switch (item.getItemId()){

-		case R.id.about_leap:

-			showAboutFragment(getCurrentFocus());

-			return true;

+		case R.id.about_leap:
+		    startActivityForResult(new Intent(this, AboutActivity.class), 0);
+			return true;
 		case R.id.new_provider:

 			addAndSelectNewProvider();

 			return true;

@@ -486,23 +489,6 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 			return super.onOptionsItemSelected(item);

 		}

 	}

-	

-	/**

-	 * 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

-	 */

-	public void showAboutFragment(View view) {

-		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

-		Fragment previous_about_fragment = getFragmentManager().findFragmentByTag(AboutFragment.TAG);

-		if (previous_about_fragment == null) {

-			fragment_transaction.addToBackStack(null);

-

-			Fragment newFragment = AboutFragment.newInstance();

-			fragment_transaction.replace(R.id.configuration_wizard_layout, newFragment, AboutFragment.TAG).commit();

-		}

-	}

 		

 	public void showAllProviders() {

 		provider_list_fragment = (ProviderListFragment) getFragmentManager().findFragmentByTag(ProviderListFragment.TAG);