mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-26 23:25:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

Partly fix messages loading

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-13 12:13:27 +02:00
parent 82170b77d7
commit 0a0aece7d0
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View file

@ -1091,6 +1091,19 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void processMessages(Response response, boolean isFromTheFuture, int timeout) { private void processMessages(Response response, boolean isFromTheFuture, int timeout) {
if (response.code() == 200) { if (response.code() == 200) {
String xChatLastGivenHeader;
if (response.headers().size() > 0 && !TextUtils.isEmpty((xChatLastGivenHeader = response.headers().get
("X-Chat-Last-Given")))) {
if (xChatLastGivenHeader != null) {
if (isFromTheFuture) {
globalLastKnownFutureMessageId = Integer.parseInt(xChatLastGivenHeader);
} else {
globalLastKnownPastMessageId = Integer.parseInt(xChatLastGivenHeader);
}
}
}
ChatOverall chatOverall = (ChatOverall) response.body(); ChatOverall chatOverall = (ChatOverall) response.body();
List<ChatMessage> chatMessageList = chatOverall.getOcs().getData(); List<ChatMessage> chatMessageList = chatOverall.getOcs().getData();
@ -1129,17 +1142,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
chatMessage.setOneToOneConversation(currentConversation.getType().equals(Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL)); chatMessage.setOneToOneConversation(currentConversation.getType().equals(Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL));
chatMessage.setLinkPreviewAllowed(isLinkPreviewAllowed); chatMessage.setLinkPreviewAllowed(isLinkPreviewAllowed);
chatMessage.setActiveUser(conversationUser); chatMessage.setActiveUser(conversationUser);
if (globalLastKnownPastMessageId == -1 || chatMessageList.get(i).getJsonMessageId() <
globalLastKnownPastMessageId) {
globalLastKnownPastMessageId = chatMessageList.get(i).getJsonMessageId();
}
if (globalLastKnownFutureMessageId == -1) {
if (chatMessageList.get(i).getJsonMessageId() > globalLastKnownFutureMessageId) {
globalLastKnownFutureMessageId = chatMessageList.get(i).getJsonMessageId();
}
}
} }
if (adapter != null) { if (adapter != null) {
@ -1203,13 +1205,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
layoutManager.scrollToPositionWithOffset(adapter.getMessagePositionByIdInReverse("-1"), messagesListView.getHeight() / 2); layoutManager.scrollToPositionWithOffset(adapter.getMessagePositionByIdInReverse("-1"), messagesListView.getHeight() / 2);
} }
String xChatLastGivenHeader;
if (response.headers().size() > 0 && !TextUtils.isEmpty((xChatLastGivenHeader = response.headers().get
("X-Chat-Last-Given")))) {
if (xChatLastGivenHeader != null) {
globalLastKnownFutureMessageId = Integer.parseInt(xChatLastGivenHeader);
}
}
} }
if (!lookingIntoFuture && inChat) { if (!lookingIntoFuture && inChat) {