diff options
author | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 22:48:03 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 22:48:03 +0100 |
commit | 673c4221554fc92d87fa306c8a95cefb75693d78 (patch) | |
tree | c2e74c1ab1d42f05a27f64b6d915a39f639ee7dc /app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java | |
parent | f10380f7d8bc85d8127328a9d9c092bc109bb340 (diff) | |
parent | 67ff3447f10c43770dc9ee4dccf358321063d131 (diff) |
Merge remote-tracking branch '0xacab/0.9.8' into 0.9.8/sidebar
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java | 11 |
1 files changed, 0 insertions, 11 deletions
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 d124c395..61349490 100644 --- a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java +++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java @@ -60,8 +60,6 @@ public class SessionDialog extends DialogFragment { @InjectView(R.id.password_entered) EditText password_field; - private static boolean is_eip_pending = false; - public static SessionDialog getInstance(Provider provider, Bundle arguments) { SessionDialog dialog = new SessionDialog(); if (provider.getName().equalsIgnoreCase("riseup")) { @@ -100,7 +98,6 @@ public class SessionDialog extends DialogFragment { .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); - interface_with_Dashboard.cancelLoginOrSignup(); } }) .setNeutralButton(R.string.signup_button, new DialogInterface.OnClickListener() { @@ -116,7 +113,6 @@ public class SessionDialog extends DialogFragment { } private void setUp(Bundle arguments) { - is_eip_pending = arguments.getBoolean(VpnFragment.IS_PENDING, false); if (arguments.containsKey(ERRORS.PASSWORD_INVALID_LENGTH.toString())) password_field.setError(getString(R.string.error_not_valid_password_user_message)); else if (arguments.containsKey(ERRORS.RISEUP_WARNING.toString())) { @@ -160,7 +156,6 @@ public class SessionDialog extends DialogFragment { public void signUp(String username, String password); - public void cancelLoginOrSignup(); } SessionDialogInterface interface_with_Dashboard; @@ -177,10 +172,4 @@ public class SessionDialog extends DialogFragment { } } - @Override - public void onCancel(DialogInterface dialog) { - super.onCancel(dialog); - if (is_eip_pending) - interface_with_Dashboard.cancelLoginOrSignup(); - } } |