create LoginActivity and SignUpActivity

8 files changed, 264 insertions, 10 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
index 601615b6..9253cfe6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
@@ -69,7 +69,7 @@ import static android.view.View.VISIBLE;
  * @author cyberta
  */
 
-public abstract class BaseConfigurationWizard extends AppCompatActivity
+public abstract class BaseConfigurationWizard extends ButterKnifeActivity
         implements NewProviderDialog.NewProviderDialogInterface, DownloadFailedDialog.DownloadFailedDialogInterface, ProviderAPIResultReceiver.Receiver {
     @InjectView(R.id.progressbar_configuration_wizard)
     protected ProgressBar mProgressBar;
@@ -166,7 +166,6 @@ public abstract class BaseConfigurationWizard extends AppCompatActivity
 
     private void setUpInitialUI() {
         setContentView(R.layout.configuration_wizard_activity);
-        ButterKnife.inject(this);
 
         hideProgressBar();
     }
diff --git a/app/src/main/java/se/leap/bitmaskclient/ButterKnifeActivity.java b/app/src/main/java/se/leap/bitmaskclient/ButterKnifeActivity.java
new file mode 100644
index 00000000..41164463
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/ButterKnifeActivity.java
@@ -0,0 +1,30 @@
+package se.leap.bitmaskclient;
+
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import butterknife.ButterKnife;
+
+/**
+ * Automatically inject with ButterKnife after calling setContentView
+ */
+
+public abstract class ButterKnifeActivity extends AppCompatActivity {
+
+    @Override
+    public void setContentView(View view) {
+        super.setContentView(view);
+        ButterKnife.inject(this);
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        super.setContentView(layoutResID);
+        ButterKnife.inject(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 8c33a6cd..b36c8cc2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -57,7 +57,7 @@ import static se.leap.bitmaskclient.Constants.REQUEST_CODE_SWITCH_PROVIDER;
  * @author Sean Leonard <meanderingcode@aetherislands.net>
  * @author parmegv
  */
-public class Dashboard extends AppCompatActivity {
+public class Dashboard extends ButterKnifeActivity {
 
     public static final String TAG = Dashboard.class.getSimpleName();
 
@@ -280,7 +280,6 @@ public class Dashboard extends AppCompatActivity {
     // just to start services and destroy them afterwards
     private void buildDashboard(boolean hideAndTurnOnEipOnBoot) {
         setContentView(R.layout.dashboard);
-        ButterKnife.inject(this);
 
         provider_name.setText(provider.getDomain());
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java b/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java
new file mode 100644
index 00000000..1b36d807
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java
@@ -0,0 +1,29 @@
+package se.leap.bitmaskclient;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import butterknife.OnClick;
+
+/**
+ * Created by fupduck on 09.01.18.
+ */
+
+public class LoginActivity extends ProviderCredentialsBaseActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.a_login);
+
+        setProviderHeaderText("providerNAME");
+        setProviderHeaderLogo(R.drawable.mask);
+    }
+
+    @Override
+    @OnClick(R.id.button)
+    void handleButton() {
+        login(getUsername(), getPassword());
+    }
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
new file mode 100644
index 00000000..c61b078f
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
@@ -0,0 +1,134 @@
+package se.leap.bitmaskclient;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.design.widget.TextInputEditText;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import butterknife.InjectView;
+import butterknife.OnClick;
+import se.leap.bitmaskclient.userstatus.SessionDialog;
+import se.leap.bitmaskclient.userstatus.User;
+
+/**
+ * Created by fupduck on 09.01.18.
+ */
+
+public abstract class ProviderCredentialsBaseActivity extends ButterKnifeActivity {
+
+    protected ProviderAPIResultReceiver providerAPIResultReceiver;
+
+    @InjectView(R.id.provider_header_logo)
+    ImageView providerHeaderLogo;
+
+    @InjectView(R.id.provider_header_text)
+    TextView providerHeaderText;
+
+    @InjectView(R.id.provider_credentials_username)
+    TextInputEditText providerCredentialsUsername;
+
+    @InjectView(R.id.provider_credentials_password)
+    TextInputEditText providerCredentialsPassword;
+
+    @InjectView(R.id.button)
+    Button providerCredentialsButton;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        providerAPIResultReceiver = new ProviderAPIResultReceiver(new Handler(), new ProviderCredentialsReceiver(this));
+
+    }
+
+    @OnClick(R.id.button)
+    abstract void handleButton();
+
+    protected void setProviderHeaderLogo(@DrawableRes int providerHeaderLogo) {
+        this.providerHeaderLogo.setImageResource(providerHeaderLogo);
+    }
+
+    protected void setProviderHeaderText(String providerHeaderText) {
+        this.providerHeaderText.setText(providerHeaderText);
+    }
+
+    protected void setProviderHeaderText(@StringRes int providerHeaderText) {
+        this.providerHeaderText.setText(providerHeaderText);
+    }
+
+    protected void setButtonText(@StringRes int buttonText) {
+        providerCredentialsButton.setText(buttonText);
+    }
+
+    String getUsername() {
+        return providerCredentialsUsername.getText().toString();
+    }
+
+    String getPassword() {
+        return providerCredentialsPassword.getText().toString();
+    }
+
+    void login(String username, String password) {
+        User.setUserName(username);
+        Bundle parameters = bundlePassword(password);
+        ProviderAPICommand.execute(parameters, ProviderAPI.LOG_IN, providerAPIResultReceiver);
+    }
+
+    public void signUp(String username, String password) {
+        User.setUserName(username);
+        Bundle parameters = bundlePassword(password);
+        ProviderAPICommand.execute(parameters, ProviderAPI.SIGN_UP, providerAPIResultReceiver);
+    }
+    protected Bundle bundlePassword(String password) {
+        Bundle parameters = new Bundle();
+        if (!password.isEmpty())
+            parameters.putString(SessionDialog.PASSWORD, password);
+        return parameters;
+    }
+
+    public static class ProviderCredentialsReceiver implements ProviderAPIResultReceiver.Receiver{
+
+        private ProviderCredentialsBaseActivity activity;
+
+        ProviderCredentialsReceiver(ProviderCredentialsBaseActivity activity) {
+            this.activity = activity;
+        }
+
+        @Override
+        public void onReceiveResult(int resultCode, Bundle resultData) {
+            if (resultCode == ProviderAPI.SUCCESSFUL_SIGNUP) {
+                String username = resultData.getString(SessionDialog.USERNAME);
+                String password = resultData.getString(SessionDialog.PASSWORD);
+                activity.login(username, password);
+            } else if (resultCode == ProviderAPI.FAILED_SIGNUP) {
+                //MainActivity.sessionDialog(resultData);
+            } else if (resultCode == ProviderAPI.SUCCESSFUL_LOGIN) {
+                Intent intent = new Intent(activity, MainActivity.class);
+                activity.startActivity(intent);
+            } else if (resultCode == ProviderAPI.FAILED_LOGIN) {
+                //MainActivity.sessionDialog(resultData);
+//  TODO MOVE
+//          } else if (resultCode == ProviderAPI.SUCCESSFUL_LOGOUT) {
+//                if (switching_provider) activity.switchProvider();
+//            } else if (resultCode == ProviderAPI.LOGOUT_FAILED) {
+//                activity.setResult(RESULT_CANCELED);
+//            } else if (resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {
+//                activity.eip_fragment.updateEipService();
+//                activity.setResult(RESULT_OK);
+//            } else if (resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
+//                activity.setResult(RESULT_CANCELED);
+//            } else if (resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_EIP_SERVICE) {
+//                activity.eip_fragment.updateEipService();
+//                activity.setResult(RESULT_OK);
+//            } else if (resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_EIP_SERVICE) {
+//                activity.setResult(RESULT_CANCELED);
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java b/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java
new file mode 100644
index 00000000..f6344065
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java
@@ -0,0 +1,66 @@
+package se.leap.bitmaskclient;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.text.Editable;
+import android.text.TextWatcher;
+
+import butterknife.InjectView;
+import butterknife.OnClick;
+
+/**
+ * Create an account with a provider
+ */
+
+public class SignupActivity extends ProviderCredentialsBaseActivity {
+
+    @InjectView(R.id.provider_credentials_password_verification)
+    TextInputEditText providerCredentialsPasswordVerification;
+
+    @InjectView(R.id.provider_credentials_password_verification_layout)
+    TextInputLayout providerCredentialsPasswordVerificationLayout;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.a_signup);
+
+        setProviderHeaderText("providerNAME");
+        setProviderHeaderLogo(R.drawable.mask);
+
+        setButtonText(R.string.signup_button);
+
+        providerCredentialsPasswordVerification.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if(getPassword().equals(getPasswordVerification())) {
+                    providerCredentialsPasswordVerificationLayout.setError(null);
+                } else {
+                    providerCredentialsPasswordVerificationLayout.setError(getString(R.string.password_mismatch));
+                }
+            }
+        });
+    }
+
+    @Override
+    @OnClick(R.id.button)
+    void handleButton() {
+        if (getPassword().equals(getPasswordVerification())) {
+            signUp(getUsername(), getPassword());
+        }
+    }
+
+    private String getPasswordVerification() {
+        return providerCredentialsPasswordVerification.getText().toString();
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
index 1256c619..d86da957 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
@@ -51,7 +51,7 @@ public class SessionDialog extends DialogFragment {
     final public static String USERNAME = "username";
     final public static String PASSWORD = "password";
 
-    public static enum ERRORS {
+    public enum ERRORS {
         USERNAME_MISSING,
         PASSWORD_INVALID_LENGTH,
         RISEUP_WARNING
@@ -156,9 +156,9 @@ public class SessionDialog extends DialogFragment {
      * @author parmegv
      */
     public interface SessionDialogInterface {
-        public void logIn(String username, String password);
+        void logIn(String username, String password);
 
-        public void signUp(String username, String password);
+        void signUp(String username, String password);
 
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
index a6439a16..07c102e4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
@@ -2,7 +2,6 @@ package se.leap.bitmaskclient.userstatus;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,7 +17,6 @@ import java.util.Observer;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 import butterknife.OnClick;
-import se.leap.bitmaskclient.Dashboard;
 import se.leap.bitmaskclient.MainActivity;
 import se.leap.bitmaskclient.Provider;
 import se.leap.bitmaskclient.ProviderAPI;
@@ -74,7 +72,6 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
     @Override
     public void onAttach(Context activity) {
         super.onAttach(activity);
-        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler(), Dashboard.dashboardReceiver);
     }
 
     public void restoreSessionStatus(Bundle savedInstanceState) {