From 230ae10fb3a0c08cbd16e91fce041133bdf5ae8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 5 May 2014 16:06:53 +0200
Subject: New menu option: signup.

There is some problem in the maths, because the server says it's ok but
login doesn't work from Android app nor from webapp.
---
 .../main/java/se/leap/bitmaskclient/Dashboard.java | 59 +++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/Dashboard.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 3c17ebb8..241286bb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -21,6 +21,7 @@ import org.json.JSONObject;
 
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
+import se.leap.bitmaskclient.SignUpDialog;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DialogFragment;
@@ -50,7 +51,7 @@ import android.widget.Toast;
  * @author Sean Leonard <meanderingcode@aetherislands.net>
  * @author parmegv
  */
-public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface,Receiver {
+public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface, SignUpDialog.SignUpDialogInterface, Receiver {
 
 	protected static final int CONFIGURE_LEAP = 0;
 	protected static final int SWITCH_PROVIDER = 1;
@@ -204,6 +205,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 					menu.findItem(R.id.login_button).setVisible(true);
 					menu.findItem(R.id.logout_button).setVisible(false);
 				}
+				menu.findItem(R.id.signup_button).setVisible(true);
 			}
 		} catch (JSONException e) {
 			// TODO Auto-generated catch block
@@ -243,6 +245,9 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		case R.id.logout_button:
 			logOut();
 			return true;
+		case R.id.signup_button:
+			signUpDialog(((ViewGroup)findViewById(android.R.id.content)).getChildAt(0), Bundle.EMPTY);
+			return true;
 		default:
 				return super.onOptionsItemSelected(item);
 		}
@@ -340,6 +345,58 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    newFragment.show(fragment_transaction, LogInDialog.TAG);
 	}
 
+    	@Override
+	public void signUp(String username, String password) {
+	    mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
+	    eipStatus = (TextView) findViewById(R.id.eipStatus);
+		
+	    providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());
+	    providerAPI_result_receiver.setReceiver(this);
+		
+	    Intent provider_API_command = new Intent(this, ProviderAPI.class);
+
+	    Bundle parameters = new Bundle();
+	    parameters.putString(SignUpDialog.USERNAME, username);
+	    parameters.putString(SignUpDialog.PASSWORD, password);
+
+	    JSONObject provider_json;
+	    try {
+		provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
+		parameters.putString(Provider.API_URL, provider_json.getString(Provider.API_URL) + "/" + provider_json.getString(Provider.API_VERSION));
+	    } catch (JSONException e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	    }
+
+	    provider_API_command.setAction(ProviderAPI.SRP_REGISTER);
+	    provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
+	    provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+		
+	    mProgressBar.setVisibility(ProgressBar.VISIBLE);
+	    eipStatus.setText(R.string.authenticating_message);
+	    //mProgressBar.setMax(4);
+	    startService(provider_API_command);
+	}
+    
+	/**
+	 * Shows the sign up dialog.
+	 * @param view from which the dialog is created.
+	 */
+	public void signUpDialog(View view, Bundle resultData) {
+	    FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();
+	    Fragment previous_sign_up_dialog = getFragmentManager().findFragmentByTag(SignUpDialog.TAG);
+	    if (previous_sign_up_dialog != null) {
+	        fragment_transaction.remove(previous_sign_up_dialog);
+	    }
+	    fragment_transaction.addToBackStack(null);
+
+	    DialogFragment newFragment = SignUpDialog.newInstance();
+	    if(resultData != null && !resultData.isEmpty()) {
+	    	newFragment.setArguments(resultData);
+	    }
+	    newFragment.show(fragment_transaction, SignUpDialog.TAG);
+	}
+
 	/**
 	 * Asks ProviderAPI to download an authenticated OpenVPN certificate.
 	 * @param session_id cookie for the server to allow us to download the certificate.
-- 
cgit v1.2.3