Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
7b0bfe19
Commit
7b0bfe19
authored
Jan 05, 2017
by
Yusuke Iwaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not show ServerConfigActivity with waiting screen during token login.
parent
b228661c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
10 deletions
+3
-10
MainActivity.java
.../main/java/chat/rocket/android/activity/MainActivity.java
+0
-1
ServerConfigActivity.java
...va/chat/rocket/android/activity/ServerConfigActivity.java
+3
-9
No files found.
app/src/main/java/chat/rocket/android/activity/MainActivity.java
View file @
7b0bfe19
...
...
@@ -144,7 +144,6 @@ public class MainActivity extends AbstractAuthedActivity {
.
createObjectObserver
(
realm
->
Session
.
queryDefaultSession
(
realm
)
.
isNotNull
(
Session
.
TOKEN
)
.
equalTo
(
Session
.
TOKEN_VERIFIED
,
true
)
.
isNull
(
Session
.
ERROR
))
.
setOnUpdateListener
(
session
->
{
if
(
session
==
null
&&
isForeground
)
{
...
...
app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java
View file @
7b0bfe19
...
...
@@ -18,7 +18,7 @@ import chat.rocket.android.realm_helper.RealmStore;
import
chat.rocket.android.service.RocketChatService
;
/**
* Activity for Login, Sign-up, and
C
onnecting...
* Activity for Login, Sign-up, and
Retry c
onnecting...
*/
public
class
ServerConfigActivity
extends
AbstractFragmentActivity
{
...
...
@@ -91,17 +91,11 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
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
();
if
(!
TextUtils
.
isEmpty
(
token
))
{
if
(
TextUtils
.
isEmpty
(
session
.
getError
()))
{
showFragment
(
WaitingFragment
.
create
(
getString
(
R
.
string
.
server_config_activity_authenticating
))
);
finish
();
overridePendingTransition
(
android
.
R
.
anim
.
fade_in
,
android
.
R
.
anim
.
fade_out
);
}
else
{
showFragment
(
new
RetryLoginFragment
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment