diff options
author | Parménides GV <parmegv@sdf.org> | 2014-11-07 11:00:43 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-11-07 11:00:43 +0100 |
commit | 13d154326aaf34798c1232a42318fd71e9df9779 (patch) | |
tree | 4ad051ddb4e6faa11b5c67795e9285bb64d1648a /app/src/main/java/se/leap/bitmaskclient/LogInDialog.java | |
parent | 0009911f6b9320b3bea541f88fcdc30364d2a681 (diff) | |
parent | 6544b8d32ccf81a6c1d832217642b873be8dc6b7 (diff) |
Merge branch 'develop' into release-0.8.0
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/LogInDialog.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/LogInDialog.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java b/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java index 45d3a373..5a0c9a6d 100644 --- a/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java +++ b/app/src/main/java/se/leap/bitmaskclient/LogInDialog.java @@ -42,15 +42,10 @@ import android.widget.TextView; * @author parmegv * */ -public class LogInDialog extends DialogFragment { +public class LogInDialog extends SessionDialogInterface { - final public static String TAG = "logInDialog"; - final public static String VERB = "log in"; - final public static String USERNAME = "username"; - final public static String PASSWORD = "password"; - final public static String USERNAME_MISSING = "username missing"; - final public static String PASSWORD_INVALID_LENGTH = "password_invalid_length"; + final public static String TAG = LogInDialog.class.getSimpleName(); private static boolean is_eip_pending = false; @@ -93,7 +88,7 @@ public class LogInDialog extends DialogFragment { String username = username_field.getText().toString(); String password = password_field.getText().toString(); dialog.dismiss(); - interface_with_Dashboard.authenticate(username, password); + interface_with_Dashboard.logIn(username, password); } }) .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @@ -120,7 +115,7 @@ public class LogInDialog extends DialogFragment { * */ public interface LogInDialogInterface { - public void authenticate(String username, String password); + public void logIn(String username, String password); public void cancelAuthedEipOn(); public void signUp(String username, String password); public void cancelLoginOrSignup(); @@ -149,8 +144,8 @@ public class LogInDialog extends DialogFragment { @Override public void onCancel(DialogInterface dialog) { + super.onCancel(dialog); if(is_eip_pending) interface_with_Dashboard.cancelAuthedEipOn(); - super.onCancel(dialog); } } |