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
e387dbcf
Commit
e387dbcf
authored
Nov 09, 2016
by
Yusuke Iwaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix "Authenticationg..." back press process.
parent
ac6b09ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ServerConfigActivity.java
...va/chat/rocket/android/activity/ServerConfigActivity.java
+3
-3
ServerConfig.java
...src/main/java/chat/rocket/android/model/ServerConfig.java
+3
-2
No files found.
app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java
View file @
e387dbcf
...
@@ -163,10 +163,10 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
...
@@ -163,10 +163,10 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
}
}
@Override
protected
void
onBackPresseNotHandled
()
{
@Override
protected
void
onBackPresseNotHandled
()
{
if
(
ServerConfig
.
hasActiveConnection
())
{
if
(
ServerConfig
.
hasLoginRequiredConnection
())
{
super
.
onBackPresseNotHandled
();
}
else
{
moveTaskToBack
(
true
);
moveTaskToBack
(
true
);
}
else
{
super
.
onBackPresseNotHandled
();
}
}
}
}
}
}
app/src/main/java/chat/rocket/android/model/ServerConfig.java
View file @
e387dbcf
...
@@ -30,9 +30,10 @@ public class ServerConfig extends RealmObject {
...
@@ -30,9 +30,10 @@ public class ServerConfig extends RealmObject {
return
realm
.
where
(
ServerConfig
.
class
).
isNotNull
(
"token"
);
return
realm
.
where
(
ServerConfig
.
class
).
isNotNull
(
"token"
);
}
}
public
static
boolean
has
Active
Connection
()
{
public
static
boolean
has
LoginRequired
Connection
()
{
ServerConfig
config
=
ServerConfig
config
=
RealmHelper
.
executeTransactionForRead
(
realm
->
queryActiveConnections
(
realm
).
findFirst
());
RealmHelper
.
executeTransactionForRead
(
realm
->
queryLoginRequiredConnections
(
realm
).
findFirst
());
return
config
!=
null
;
return
config
!=
null
;
}
}
...
...
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