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
0b7927a0
Commit
0b7927a0
authored
Jan 06, 2017
by
Yusuke Iwaki
Committed by
GitHub
Jan 06, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #129 from RocketChat/two_factor_auth
fix login screen not to be refreshed onResume.
parents
fdfd0d1d
246e3b13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-1
ServerConfigActivity.java
...va/chat/rocket/android/activity/ServerConfigActivity.java
+3
-3
No files found.
app/src/main/AndroidManifest.xml
View file @
0b7927a0
...
...
@@ -29,7 +29,8 @@
android:windowSoftInputMode=
"adjustResize"
/>
<activity
android:name=
".activity.ServerConfigActivity"
android:windowSoftInputMode=
"adjustResize"
/>
android:windowSoftInputMode=
"adjustResize"
android:configChanges=
"orientation|screenSize"
/>
<service
android:name=
".service.RocketChatService"
/>
...
...
app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java
View file @
0b7927a0
...
...
@@ -60,20 +60,20 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
setContentView
(
R
.
layout
.
simple_screen
);
showFragment
(
new
WaitingFragment
());
serverConfigErrorObserver
.
sub
();
}
@Override
protected
void
onResume
()
{
super
.
onResume
();
RocketChatService
.
keepAlive
(
this
);
serverConfigErrorObserver
.
sub
();
}
@Override
protected
void
on
Pause
()
{
protected
void
on
Destroy
()
{
sessionObserver
.
unsub
();
serverConfigErrorObserver
.
unsub
();
super
.
on
Pause
();
super
.
on
Destroy
();
}
private
void
onRenderServerConfigError
(
ServerConfig
config
)
{
...
...
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