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
4e3bdc2d
Commit
4e3bdc2d
authored
May 04, 2017
by
Tiago Cunha
Committed by
GitHub
May 04, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #260 from congnt24/fix_losttext
fix lost text when turn off then turn on screen
parents
07345af1
aba90e91
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
4 deletions
+48
-4
AbstractAuthedActivity.java
.../chat/rocket/android/activity/AbstractAuthedActivity.java
+5
-4
MainActivity.java
.../main/java/chat/rocket/android/activity/MainActivity.java
+10
-0
MainPresenter.java
...main/java/chat/rocket/android/activity/MainPresenter.java
+7
-0
KeyboardHelper.java
.../main/java/chat/rocket/android/helper/KeyboardHelper.java
+26
-0
No files found.
app/src/main/java/chat/rocket/android/activity/AbstractAuthedActivity.java
View file @
4e3bdc2d
...
@@ -36,6 +36,9 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
...
@@ -36,6 +36,9 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
if
(
savedInstanceState
==
null
)
{
if
(
savedInstanceState
==
null
)
{
handleIntent
(
getIntent
());
handleIntent
(
getIntent
());
}
}
updateHostnameIfNeeded
(
rocketChatCache
.
getSelectedServerHostname
());
updateRoomIdIfNeeded
(
rocketChatCache
.
getSelectedRoomId
());
}
}
@Override
@Override
...
@@ -148,12 +151,10 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
...
@@ -148,12 +151,10 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
@Override
@Override
protected
void
onResume
()
{
protected
void
onResume
()
{
super
.
onResume
();
super
.
onResume
();
ConnectivityManager
.
getInstance
(
getApplicationContext
()).
keepAliveServer
();
updateHostnameIfNeeded
(
rocketChatCache
.
getSelectedServerHostname
());
updateRoomIdIfNeeded
(
rocketChatCache
.
getSelectedRoomId
());
subscribeToConfigChanges
();
subscribeToConfigChanges
();
ConnectivityManager
.
getInstance
(
getApplicationContext
()).
keepAliveServer
();
}
}
@Override
@Override
...
...
app/src/main/java/chat/rocket/android/activity/MainActivity.java
View file @
4e3bdc2d
...
@@ -15,6 +15,7 @@ import chat.rocket.android.api.MethodCallHelper;
...
@@ -15,6 +15,7 @@ import chat.rocket.android.api.MethodCallHelper;
import
chat.rocket.android.fragment.chatroom.HomeFragment
;
import
chat.rocket.android.fragment.chatroom.HomeFragment
;
import
chat.rocket.android.fragment.chatroom.RoomFragment
;
import
chat.rocket.android.fragment.chatroom.RoomFragment
;
import
chat.rocket.android.fragment.sidebar.SidebarMainFragment
;
import
chat.rocket.android.fragment.sidebar.SidebarMainFragment
;
import
chat.rocket.android.helper.KeyboardHelper
;
import
chat.rocket.core.interactors.CanCreateRoomInteractor
;
import
chat.rocket.core.interactors.CanCreateRoomInteractor
;
import
chat.rocket.core.interactors.RoomInteractor
;
import
chat.rocket.core.interactors.RoomInteractor
;
import
chat.rocket.core.interactors.SessionInteractor
;
import
chat.rocket.core.interactors.SessionInteractor
;
...
@@ -48,6 +49,14 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
...
@@ -48,6 +49,14 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
setupSidebar
();
setupSidebar
();
}
}
@Override
protected
void
onResume
()
{
super
.
onResume
();
if
(
presenter
!=
null
&&
presenter
instanceof
MainPresenter
)
{
((
MainPresenter
)
presenter
).
bindViewOnly
(
this
);
}
}
@Override
@Override
protected
void
onPause
()
{
protected
void
onPause
()
{
if
(
presenter
!=
null
)
{
if
(
presenter
!=
null
)
{
...
@@ -172,6 +181,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
...
@@ -172,6 +181,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
public
void
showRoom
(
String
hostname
,
String
roomId
)
{
public
void
showRoom
(
String
hostname
,
String
roomId
)
{
showFragment
(
RoomFragment
.
create
(
hostname
,
roomId
));
showFragment
(
RoomFragment
.
create
(
hostname
,
roomId
));
closeSidebarIfNeeded
();
closeSidebarIfNeeded
();
KeyboardHelper
.
hideSoftKeyboard
(
this
);
}
}
@Override
@Override
...
...
app/src/main/java/chat/rocket/android/activity/MainPresenter.java
View file @
4e3bdc2d
...
@@ -44,6 +44,13 @@ public class MainPresenter extends BasePresenter<MainContract.View>
...
@@ -44,6 +44,13 @@ public class MainPresenter extends BasePresenter<MainContract.View>
this
.
rocketChatCache
=
rocketChatCache
;
this
.
rocketChatCache
=
rocketChatCache
;
}
}
public
void
bindViewOnly
(
@NonNull
MainContract
.
View
view
)
{
super
.
bindView
(
view
);
subscribeToUnreadCount
();
subscribeToSession
();
setUserOnline
();
}
@Override
@Override
public
void
bindView
(
@NonNull
MainContract
.
View
view
)
{
public
void
bindView
(
@NonNull
MainContract
.
View
view
)
{
super
.
bindView
(
view
);
super
.
bindView
(
view
);
...
...
app/src/main/java/chat/rocket/android/helper/KeyboardHelper.java
0 → 100644
View file @
4e3bdc2d
package
chat
.
rocket
.
android
.
helper
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.view.View
;
import
android.view.inputmethod.InputMethodManager
;
public
class
KeyboardHelper
{
public
static
void
hideSoftKeyboard
(
Activity
activity
)
{
if
(
activity
.
getCurrentFocus
()
!=
null
)
{
InputMethodManager
inputMethodManager
=
(
InputMethodManager
)
activity
.
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
inputMethodManager
.
hideSoftInputFromWindow
(
activity
.
getCurrentFocus
().
getWindowToken
(),
0
);
}
}
public
static
void
showSoftKeyboard
(
View
view
)
{
InputMethodManager
inputMethodManager
=
(
InputMethodManager
)
view
.
getContext
().
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
view
.
requestFocus
();
inputMethodManager
.
showSoftInput
(
view
,
0
);
}
public
static
void
toggleKeyBoard
(
Context
context
)
{
InputMethodManager
inputMethodManager
=
(
InputMethodManager
)
context
.
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
inputMethodManager
.
toggleSoftInput
(
InputMethodManager
.
SHOW_FORCED
,
InputMethodManager
.
HIDE_IMPLICIT_ONLY
);
}
}
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