diff options
author | Parménides GV <parmegv@sdf.org> | 2014-10-14 22:16:40 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-10-14 22:16:40 +0200 |
commit | 948f984f6aa4660f849ca643d3b228beac6a1652 (patch) | |
tree | 286bd9d2088eb414e7c8fb0dfd4e3c32f7145791 /app/src/main/java/se/leap/bitmaskclient/LogInDialog.java | |
parent | 8bc58f450262ba2cf64e92772746b62018f80e59 (diff) | |
parent | 6bc3d7da8fdf32cdbd934831f2385f5098c7f979 (diff) |
Merge branch 'feature/Start-EIP-after-logging-in-#6096' into develop
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); } } |