Use anonymously from ProviderDetail works OK.

Tested with dev.bitmask.net, I use the previously downloaded certificate
(I should not do that, I'll file an issue because I should download it
once the user has requested to do so).

Next step: login button from ProviderDetailFragment.

3 files changed, 45 insertions, 3 deletions

diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index 6c016209..7f29a408 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -31,7 +31,7 @@ import android.widget.Toast;
  *

  */

 public class ConfigurationWizard extends Activity

-implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogInterface, Receiver {

+implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogInterface, ProviderDetailFragment.ProviderDetailFragmentInterface, Receiver {

 

 	private ProviderItem mSelectedProvider;

 	private ProgressDialog mProgressDialog;

@@ -85,8 +85,16 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 				if(mProgressDialog == null)

 					mProgressDialog =  ProgressDialog.show(this, getResources().getString(R.string.config_wait_title), getResources().getString(R.string.config_connecting_provider), true);

 				mProgressDialog.setMessage(getResources().getString(R.string.config_downloading_services));

-				if(mSelectedProvider == null)

+				if(mSelectedProvider == null) {

 					mSelectedProvider = getProvider(resultData.getString(ConfigHelper.PROVIDER_ID));

+

+					ProviderListFragment providerList = new ProviderListFragment();

+

+					FragmentManager fragmentManager = getFragmentManager();

+					fragmentManager.beginTransaction()

+						.replace(R.id.configuration_wizard_layout, providerList, "providerlist")

+						.commit();

+				}

 				downloadJSONFiles(mSelectedProvider);

 			} catch (JSONException e) {

 				// TODO Auto-generated catch block

@@ -321,4 +329,15 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 		

 		startService(provider_API_command);

 	}

+

+	@Override

+	public void login() {

+		//TODO Start dashboard and show login dialog

+	}

+

+	@Override

+	public void use_anonymously() {

+		setResult(RESULT_OK);

+		finish();

+	}

 }

diff --git a/src/se/leap/leapclient/LogInDialog.java b/src/se/leap/leapclient/LogInDialog.java
index 3b240ba1..99b19628 100644
--- a/src/se/leap/leapclient/LogInDialog.java
+++ b/src/se/leap/leapclient/LogInDialog.java
@@ -94,7 +94,7 @@ public class LogInDialog extends DialogFragment {
         	interface_with_Dashboard = (LogInDialogInterface) activity;
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString()
-                    + " must implement NoticeDialogListener");
+                    + " must implement LogInDialogListener");
         }
     }
 }
diff --git a/src/se/leap/leapclient/ProviderDetailFragment.java b/src/se/leap/leapclient/ProviderDetailFragment.java
index d061a708..6121ac7c 100644
--- a/src/se/leap/leapclient/ProviderDetailFragment.java
+++ b/src/se/leap/leapclient/ProviderDetailFragment.java
@@ -3,6 +3,9 @@ package se.leap.leapclient;
 import org.json.JSONException;

 import org.json.JSONObject;

 

+import se.leap.leapclient.LogInDialog.LogInDialogInterface;

+

+import android.app.Activity;

 import android.app.AlertDialog;

 import android.app.Dialog;

 import android.app.DialogFragment;

@@ -34,10 +37,12 @@ public class ProviderDetailFragment extends DialogFragment {
 			builder.setTitle(R.string.provider_details_fragment_title);

 			builder.setPositiveButton(R.string.use_anonymously_button, new DialogInterface.OnClickListener() {

 				public void onClick(DialogInterface dialog, int id) {

+					interface_with_configuration_wizard.use_anonymously();

 				}

 			});

 			builder.setNegativeButton(R.string.login_button, new DialogInterface.OnClickListener() {

 				public void onClick(DialogInterface dialog, int id) {

+					interface_with_configuration_wizard.login();

 				}

 			});

 			

@@ -51,4 +56,22 @@ public class ProviderDetailFragment extends DialogFragment {
 		ProviderDetailFragment provider_detail_fragment = new ProviderDetailFragment();

 		return provider_detail_fragment;

 	}

+	

+    @Override

+    public void onAttach(Activity activity) {

+        super.onAttach(activity);

+        try {

+        	interface_with_configuration_wizard = (ProviderDetailFragmentInterface) activity;

+        } catch (ClassCastException e) {

+            throw new ClassCastException(activity.toString()

+                    + " must implement LogInDialogListener");

+        }

+    }

+	

+	public interface ProviderDetailFragmentInterface {

+		public void login();

+		public void use_anonymously();

+	}

+	

+	ProviderDetailFragmentInterface interface_with_configuration_wizard;

 }