Commit 7b0bfe19 authored by Yusuke Iwaki's avatar Yusuke Iwaki

do not show ServerConfigActivity with waiting screen during token login.

parent b228661c
...@@ -144,7 +144,6 @@ public class MainActivity extends AbstractAuthedActivity { ...@@ -144,7 +144,6 @@ public class MainActivity extends AbstractAuthedActivity {
.createObjectObserver(realm -> .createObjectObserver(realm ->
Session.queryDefaultSession(realm) Session.queryDefaultSession(realm)
.isNotNull(Session.TOKEN) .isNotNull(Session.TOKEN)
.equalTo(Session.TOKEN_VERIFIED, true)
.isNull(Session.ERROR)) .isNull(Session.ERROR))
.setOnUpdateListener(session -> { .setOnUpdateListener(session -> {
if (session == null && isForeground) { if (session == null && isForeground) {
......
...@@ -18,7 +18,7 @@ import chat.rocket.android.realm_helper.RealmStore; ...@@ -18,7 +18,7 @@ import chat.rocket.android.realm_helper.RealmStore;
import chat.rocket.android.service.RocketChatService; import chat.rocket.android.service.RocketChatService;
/** /**
* Activity for Login, Sign-up, and Connecting... * Activity for Login, Sign-up, and Retry connecting...
*/ */
public class ServerConfigActivity extends AbstractFragmentActivity { public class ServerConfigActivity extends AbstractFragmentActivity {
...@@ -91,17 +91,11 @@ public class ServerConfigActivity extends AbstractFragmentActivity { ...@@ -91,17 +91,11 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
return; return;
} }
if (session.isTokenVerified() && TextUtils.isEmpty(session.getError())) {
finish();
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
return;
}
final String token = session.getToken(); final String token = session.getToken();
if (!TextUtils.isEmpty(token)) { if (!TextUtils.isEmpty(token)) {
if (TextUtils.isEmpty(session.getError())) { if (TextUtils.isEmpty(session.getError())) {
showFragment( finish();
WaitingFragment.create(getString(R.string.server_config_activity_authenticating))); overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
} else { } else {
showFragment(new RetryLoginFragment()); showFragment(new RetryLoginFragment());
} }
......
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