Commit 761e843b authored by Tiago Cunha's avatar Tiago Cunha Committed by GitHub

Merge pull request #208 from RocketChat/fix/regression-login-state

Fixed regression on login state
parents 65e83be0 271b9e5a
...@@ -16,6 +16,8 @@ public class LoginPresenter extends BasePresenter<LoginContract.View> ...@@ -16,6 +16,8 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
private final SessionInteractor sessionInteractor; private final SessionInteractor sessionInteractor;
private final ConnectivityManagerApi connectivityManagerApi; private final ConnectivityManagerApi connectivityManagerApi;
private boolean isLogging = false;
public LoginPresenter(String hostname, public LoginPresenter(String hostname,
SessionInteractor sessionInteractor, SessionInteractor sessionInteractor,
ConnectivityManagerApi connectivityManagerApi) { ConnectivityManagerApi connectivityManagerApi) {
...@@ -35,6 +37,10 @@ public class LoginPresenter extends BasePresenter<LoginContract.View> ...@@ -35,6 +37,10 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
return; return;
} }
if (isLogging) {
return;
}
loadSessionState(); loadSessionState();
} }
...@@ -46,12 +52,15 @@ public class LoginPresenter extends BasePresenter<LoginContract.View> ...@@ -46,12 +52,15 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
.subscribe(state -> { .subscribe(state -> {
switch (state) { switch (state) {
case UNAVAILABLE: case UNAVAILABLE:
isLogging = true;
view.showLogin(hostname); view.showLogin(hostname);
break; break;
case INVALID: case INVALID:
isLogging = false;
view.showRetryLogin(hostname); view.showRetryLogin(hostname);
break; break;
case VALID: case VALID:
isLogging = false;
view.closeView(); view.closeView();
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment