mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-11 06:44:09 +01:00
Improve things a bit
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
ec44092676
commit
6504a3b6e7
@ -522,7 +522,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
|||||||
messageInputView.getButton().setContentDescription(getResources()
|
messageInputView.getButton().setContentDescription(getResources()
|
||||||
.getString(R.string.nc_description_send_message_button));
|
.getString(R.string.nc_description_send_message_button));
|
||||||
|
|
||||||
if (currentConversation != null) {
|
if (currentConversation.getRoomId() != null) {
|
||||||
loadAvatarForStatusBar();
|
loadAvatarForStatusBar();
|
||||||
checkLobbyState();
|
checkLobbyState();
|
||||||
}
|
}
|
||||||
@ -599,12 +599,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
|||||||
messagesListView.setVisibility(View.VISIBLE);
|
messagesListView.setVisibility(View.VISIBLE);
|
||||||
messageInput.setVisibility(View.VISIBLE);
|
messageInput.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isFirstMessagesProcessing) {
|
|
||||||
pullChatMessages(0);
|
|
||||||
} else {
|
|
||||||
pullChatMessages(1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showBrowserScreen(BrowserController.BrowserType browserType) {
|
private void showBrowserScreen(BrowserController.BrowserType browserType) {
|
||||||
@ -817,6 +811,12 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
|||||||
setupWebsocket();
|
setupWebsocket();
|
||||||
checkLobbyState();
|
checkLobbyState();
|
||||||
|
|
||||||
|
if (isFirstMessagesProcessing) {
|
||||||
|
pullChatMessages(0);
|
||||||
|
} else {
|
||||||
|
pullChatMessages(1);
|
||||||
|
}
|
||||||
|
|
||||||
if (magicWebSocketInstance != null) {
|
if (magicWebSocketInstance != null) {
|
||||||
magicWebSocketInstance.joinRoomWithRoomTokenAndSession(roomToken,
|
magicWebSocketInstance.joinRoomWithRoomTokenAndSession(roomToken,
|
||||||
currentCall.getSessionId());
|
currentCall.getSessionId());
|
||||||
|
Loading…
Reference in New Issue
Block a user