gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-10 08:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix endless loading of messages

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-09 13:40:26 +02:00
parent 31ce180c6d
commit ec44092676
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -593,17 +593,18 @@ public class ChatController extends BaseController implements MessagesListAdapte
lobbyView.setVisibility(View.GONE); lobbyView.setVisibility(View.GONE);
messagesListView.setVisibility(View.VISIBLE); messagesListView.setVisibility(View.VISIBLE);
messageInput.setVisibility(View.VISIBLE); messageInput.setVisibility(View.VISIBLE);
if (isFirstMessagesProcessing) {
pullChatMessages(0);
} else {
pullChatMessages(1);
}
} }
} else { } else {
lobbyView.setVisibility(View.GONE); lobbyView.setVisibility(View.GONE);
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) {
@ -813,15 +814,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
ApplicationWideCurrentRoomHolder.getInstance().setSession(currentCall.getSessionId()); ApplicationWideCurrentRoomHolder.getInstance().setSession(currentCall.getSessionId());
startPing(); startPing();
checkLobbyState();
setupWebsocket(); setupWebsocket();
checkLobbyState();
if (isFirstMessagesProcessing) {
pullChatMessages(0);
} else {
pullChatMessages(1);
}
if (magicWebSocketInstance != null) { if (magicWebSocketInstance != null) {
magicWebSocketInstance.joinRoomWithRoomTokenAndSession(roomToken, magicWebSocketInstance.joinRoomWithRoomTokenAndSession(roomToken,
@ -873,8 +867,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(GenericOverall genericOverall) {
dispose();
checkingLobbyStatus = false; checkingLobbyStatus = false;
if (lobbyTimerHandler != null) { if (lobbyTimerHandler != null) {
@ -1011,6 +1003,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
fieldMap.put("limit", 10); fieldMap.put("limit", 10);
fieldMap.put("setReadMarker", 1); fieldMap.put("setReadMarker", 1);
Log.d("MARIO lookIntoFuture", String.valueOf(lookIntoFuture));
int lastKnown; int lastKnown;
if (lookIntoFuture > 0) { if (lookIntoFuture > 0) {
lastKnown = globalLastKnownFutureMessageId; lastKnown = globalLastKnownFutureMessageId;