2 files changed, 1 insertions, 14 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
index f857f966..a8a9ac67 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
@@ -137,7 +137,6 @@ public class VpnFragment extends Fragment implements Observer {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putBoolean(IS_PENDING, eip_status.isConnecting());
         outState.putBoolean(IS_CONNECTED, eip_status.isConnected());
         super.onSaveInstanceState(outState);
     }
@@ -160,7 +159,6 @@ public class VpnFragment extends Fragment implements Observer {
         else if (canLogInToStartEIP()) {
             wants_to_connect = true;
             Bundle bundle = new Bundle();
-            bundle.putBoolean(IS_PENDING, true);
             dashboard.sessionDialog(bundle);
         } else {
             Log.d(TAG, "WHAT IS GOING ON HERE?!");
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 37744927..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())) {
@@ -159,8 +155,7 @@ public class SessionDialog extends DialogFragment {
         public void logIn(String username, String password);
 
         public void signUp(String username, String password);
-        //FIXME: can we remove this method?
-        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();
-    }
 }