Merge branch 'feature/provider-details-fragment' into develop

5 files changed, 160 insertions, 10 deletions

diff --git a/src/se/leap/leapclient/ConfigHelper.java b/src/se/leap/leapclient/ConfigHelper.java
index 9a3bd991..e0496422 100644
--- a/src/se/leap/leapclient/ConfigHelper.java
+++ b/src/se/leap/leapclient/ConfigHelper.java
@@ -76,7 +76,11 @@ public class ConfigHelper {
     EIP_SERVICE_API_PATH = "config/eip-service.json",
     ERRORS_KEY = "errors",
     RECEIVER_TAG = "receiverTag",
-    REQUEST_TAG = "requestTag";
+    REQUEST_TAG = "requestTag",
+    PROVIDER_DETAILS_DIALOG = "providerDetailsFragment",
+    DOMAIN = "domain",
+    NAME = "name",
+    DESCRIPTION = "description"
     ;
 	
     final public static String NG_1024 =
diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index 6bf94ca6..df7da8ff 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;

@@ -46,7 +46,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
     protected void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);

         

-        setContentView(R.layout.activity_configuration_wizard);

+        setContentView(R.layout.configuration_wizard_activity);

         

         providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());

         providerAPI_result_receiver.setReceiver(this);

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

@@ -109,7 +117,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 				downloadAnonCert();

 			} else {

 				mProgressDialog.dismiss();

-				Toast.makeText(getApplicationContext(), R.string.success, Toast.LENGTH_LONG).show();

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

 				setResult(RESULT_OK);

 				finish();

 			}

@@ -120,11 +128,12 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 		}

 		else if(resultCode == ConfigHelper.CORRECTLY_DOWNLOADED_CERTIFICATE) {

 			mProgressDialog.dismiss();

-			Toast.makeText(getApplicationContext(), R.string.correctly_downloaded_json_files_message, Toast.LENGTH_LONG).show();

-			Toast.makeText(getApplicationContext(), R.string.success, Toast.LENGTH_LONG).show();

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

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

 			//mConfigState.putExtra(CERTIFICATE_RETRIEVED, true); // If this isn't the last step and finish() is moved...

 			setResult(RESULT_OK);

-			finish();

+			//finish();

+			showProviderDetails(getCurrentFocus());

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

 			mProgressDialog.dismiss();

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

@@ -268,6 +277,24 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 		DialogFragment newFragment = NewProviderDialog.newInstance();

 		newFragment.show(fragment_transaction, ConfigHelper.NEW_PROVIDER_DIALOG);

 	}

+	

+	/**

+	 * 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 showProviderDetails(View view) {

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

+		Fragment previous_provider_details_dialog = getFragmentManager().findFragmentByTag(ConfigHelper.PROVIDER_DETAILS_DIALOG);

+		if (previous_provider_details_dialog != null) {

+			fragment_transaction.remove(previous_provider_details_dialog);

+		}

+		fragment_transaction.addToBackStack(null);

+		

+		DialogFragment newFragment = ProviderDetailFragment.newInstance();

+		newFragment.show(fragment_transaction, ConfigHelper.PROVIDER_DETAILS_DIALOG);

+	}

 

 	@Override

 	public void saveAndSelectProvider(String provider_main_url, boolean danger_on) {

@@ -302,4 +329,18 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
 		

 		startService(provider_API_command);

 	}

+

+	@Override

+	public void login() {

+		Intent ask_login = new Intent();

+		ask_login.putExtra(ConfigHelper.LOG_IN, ConfigHelper.LOG_IN);

+		setResult(RESULT_OK, ask_login);

+		finish();

+	}

+

+	@Override

+	public void use_anonymously() {

+		setResult(RESULT_OK);

+		finish();

+	}

 }

diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index 3c9df56c..96b982fc 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -88,6 +88,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	@Override
 	protected void onResume() {
 		super.onResume();
+		
 		if (provider != null)
 			if (provider.hasEIP() && provider.getEIPType() == "OpenVPN")
 				OpenVPN.addStateListener(this);
@@ -98,6 +99,10 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		if ( requestCode == CONFIGURE_LEAP ) {
 			if ( resultCode == RESULT_OK ){
 				buildDashboard();
+				if(data != null && data.hasExtra(ConfigHelper.LOG_IN)) {
+					View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0);
+					logInDialog(view);
+				}
 			} else
 				configErrorDialog();
 		}
diff --git a/src/se/leap/leapclient/LogInDialog.java b/src/se/leap/leapclient/LogInDialog.java
index dcb92d89..99b19628 100644
--- a/src/se/leap/leapclient/LogInDialog.java
+++ b/src/se/leap/leapclient/LogInDialog.java
@@ -32,7 +32,7 @@ public class LogInDialog extends DialogFragment {
 		final EditText password_field = (EditText)log_in_dialog_view.findViewById(R.id.password_entered);
 		
 		builder.setView(log_in_dialog_view)
-			.setPositiveButton(R.string.log_in_button, new DialogInterface.OnClickListener() {
+			.setPositiveButton(R.string.login_button, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int id) {
 					String username = username_field.getText().toString().trim();
 					String password = password_field.getText().toString().trim();
@@ -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
new file mode 100644
index 00000000..3b6cf83c
--- /dev/null
+++ b/src/se/leap/leapclient/ProviderDetailFragment.java
@@ -0,0 +1,100 @@
+package se.leap.leapclient;

+

+import org.json.JSONException;

+import org.json.JSONObject;

+

+import android.app.Activity;

+import android.app.AlertDialog;

+import android.app.Dialog;

+import android.app.DialogFragment;

+import android.content.DialogInterface;

+import android.os.Bundle;

+import android.view.LayoutInflater;

+import android.view.View;

+import android.widget.TextView;

+

+public class ProviderDetailFragment extends DialogFragment {

+	@Override

+	public Dialog onCreateDialog(Bundle savedInstanceState) {

+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

+		try {

+

+			LayoutInflater inflater = getActivity().getLayoutInflater();

+			View provider_detail_view = inflater.inflate(R.layout.provider_detail_fragment, null);

+			

+			JSONObject provider_json = ConfigHelper.getJsonFromSharedPref(ConfigHelper.PROVIDER_KEY);

+			

+			final TextView domain = (TextView)provider_detail_view.findViewById(R.id.provider_detail_domain);

+			domain.setText(provider_json.getString(ConfigHelper.DOMAIN));

+			final TextView name = (TextView)provider_detail_view.findViewById(R.id.provider_detail_name);

+			name.setText(provider_json.getJSONObject(ConfigHelper.NAME).getString("en"));

+			final TextView description = (TextView)provider_detail_view.findViewById(R.id.provider_detail_description);

+			description.setText(provider_json.getJSONObject(ConfigHelper.DESCRIPTION).getString("en"));

+			

+			builder.setView(provider_detail_view);

+			builder.setTitle(R.string.provider_details_fragment_title);

+			

+			if(anon_allowed(provider_json)) {

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

+					public void onClick(DialogInterface dialog, int id) {

+						interface_with_configuration_wizard.use_anonymously();

+					}

+				});

+			}

+

+			if(registration_allowed(provider_json)) {

+

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

+					public void onClick(DialogInterface dialog, int id) {

+						interface_with_configuration_wizard.login();

+					}

+				});

+			}

+			

+			return builder.create();

+		} catch (JSONException e) {

+			return null;

+		}

+	}

+	

+	private boolean anon_allowed(JSONObject provider_json) {

+		try {

+			JSONObject service_description = provider_json.getJSONObject(ConfigHelper.SERVICE_KEY);

+			return service_description.has(ConfigHelper.ALLOWED_ANON) && service_description.getBoolean(ConfigHelper.ALLOWED_ANON);

+		} catch (JSONException e) {

+			return false;

+		}

+	}

+	

+	private boolean registration_allowed(JSONObject provider_json) {

+		try {

+			JSONObject service_description = provider_json.getJSONObject(ConfigHelper.SERVICE_KEY);

+			return service_description.has(ConfigHelper.ALLOW_REGISTRATION_KEY) && service_description.getBoolean(ConfigHelper.ALLOW_REGISTRATION_KEY);

+		} catch (JSONException e) {

+			return false;

+		}

+	}

+

+	public static DialogFragment newInstance() {

+		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;

+}