diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-01 11:16:48 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-01 11:16:48 +0200 |
commit | 8dc4f58d96892fbfd83094fb85b1d17656035290 (patch) | |
tree | d35a6fbab710e286eb35e7b6f16b62c3e9a79d53 /app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java | |
parent | 21aa11e5e04ffef3111010140cd7336fe181de39 (diff) | |
parent | 47e0180aaaaa5ba2cd921ebd28221ab27fd51b65 (diff) |
Merge branch 'bug/Log-in-button-is-empty-after-a-failed-log-in-#7083' into develop
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 f670553f..20189904 100644 --- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java @@ -138,10 +138,10 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia } private void updateButton() { - if(status.isLoggedIn()) + if(status.isLoggedIn() || status.didntLogOut()) button.setText(dashboard.getString(R.string.logout_button)); else if(allows_registration) { - if (status.isLoggedOut()) + if (status.isLoggedOut() || status.notLoggedIn()) button.setText(dashboard.getString(R.string.login_button)); else if (status.inProgress()) button.setText(dashboard.getString(android.R.string.cancel)); |