4 files changed, 57 insertions, 83 deletions
diff --git a/src/se/leap/bitmaskclient/AboutActivity.java b/src/se/leap/bitmaskclient/AboutActivity.java
new file mode 100644
index 00000000..a3320c81
--- /dev/null
+++ b/src/se/leap/bitmaskclient/AboutActivity.java
@@ -0,0 +1,48 @@
+package se.leap.bitmaskclient;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import se.leap.bitmaskclient.R;
+
+public class AboutActivity extends Activity  {
+	
+    final public static String TAG = "aboutFragment";
+    final public static int VIEWED = 0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+	super.onCreate(savedInstanceState);
+    	setContentView(R.layout.about);
+    	TextView ver = (TextView) findViewById(R.id.version);
+    	
+    	String version;
+    	String name="Openvpn";
+		try {
+			PackageInfo packageinfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+			version = packageinfo.versionName;
+			name = getString(R.string.app);
+		} catch (NameNotFoundException e) {
+			version = "error fetching version";
+		}
+
+    	
+    	ver.setText(getString(R.string.version_info,name,version));
+    	
+    	TextView translation = (TextView) findViewById(R.id.translation);
+    	
+    	// Don't print a text for myself
+    	if ( getString(R.string.translationby).contains("Arne Schwabe"))
+	    translation.setVisibility(TextView.INVISIBLE);
+	else
+	    translation.setText(R.string.translationby);
+	setResult(VIEWED);
+    }
+
+}
diff --git a/src/se/leap/bitmaskclient/AboutFragment.java b/src/se/leap/bitmaskclient/AboutFragment.java
deleted file mode 100644
index 4d03a44b..00000000
--- a/src/se/leap/bitmaskclient/AboutFragment.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package se.leap.bitmaskclient;
-
-import android.app.Fragment;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import se.leap.bitmaskclient.R;
-
-public class AboutFragment extends Fragment  {
-	
-    final public static String TAG = "aboutFragment";
-
-	public static Fragment newInstance() {
-		AboutFragment provider_detail_fragment = new AboutFragment();
-		return provider_detail_fragment;
-	}
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-       
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-    		Bundle savedInstanceState) {
-    	View v= inflater.inflate(R.layout.about, container, false);
-    	TextView ver = (TextView) v.findViewById(R.id.version);
-    	
-    	String version;
-    	String name="Openvpn";
-		try {
-			PackageInfo packageinfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
-			version = packageinfo.versionName;
-			name = getString(R.string.app);
-		} catch (NameNotFoundException e) {
-			version = "error fetching version";
-		}
-
-    	
-    	ver.setText(getString(R.string.version_info,name,version));
-    	
-    	TextView translation = (TextView) v.findViewById(R.id.translation);
-    	
-    	// Don't print a text for myself
-    	if ( getString(R.string.translationby).contains("Arne Schwabe"))
-    		translation.setText("");
-    	else
-    		translation.setText(R.string.translationby);
-    	return v;
-    }
-
-}
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java
index a4d8599f..444be843 100644
--- a/src/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -176,7 +176,10 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 		    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.
+		}
 	}
 
 	/**
@@ -419,9 +422,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 	@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;
@@ -429,23 +432,6 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 			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);
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java
index 7f898a67..0ef50f4a 100644
--- a/src/se/leap/bitmaskclient/Dashboard.java
+++ b/src/se/leap/bitmaskclient/Dashboard.java
@@ -207,11 +207,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		Intent intent;
 		switch (item.getItemId()){
 		case R.id.about_leap:
-			Fragment aboutFragment = new AboutFragment();
-			FragmentTransaction trans = getFragmentManager().beginTransaction();
-			trans.replace(R.id.dashboardLayout, aboutFragment);
-			trans.addToBackStack(null);
-			trans.commit();
+			intent = new Intent(this, AboutActivity.class);
+			startActivity(intent);
 			return true;
 		case R.id.legacy_interface:
 			intent = new Intent(this,MainActivity.class);