فهرست منبع

Merge pull request #3710 from nextcloud/bugfix/noid/fixReadMarker

use X-Chat-Last-Common-Read to fix read status
Marcel Hibbe 1 سال پیش
والد
کامیت
b1013e418d
1فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 6 2
      app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

+ 6 - 2
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -918,7 +918,11 @@ class ChatActivity :
                                 collapseSystemMessages()
                                 collapseSystemMessages()
                             }
                             }
 
 
-                            updateReadStatusOfAllMessages(chatMessageList[0].jsonMessageId)
+                            val newXChatLastCommonRead = state.response.headers()["X-Chat-Last-Common-Read"]?.let {
+                                Integer.parseInt(it)
+                            }
+
+                            updateReadStatusOfAllMessages(newXChatLastCommonRead)
 
 
                             processCallStartedMessages(chatMessageList)
                             processCallStartedMessages(chatMessageList)
 
 
@@ -927,7 +931,7 @@ class ChatActivity :
                             chatViewModel.refreshChatParams(
                             chatViewModel.refreshChatParams(
                                 setupFieldsForPullChatMessages(
                                 setupFieldsForPullChatMessages(
                                     true,
                                     true,
-                                    chatMessageList[0].jsonMessageId,
+                                    newXChatLastCommonRead,
                                     true
                                     true
                                 )
                                 )
                             )
                             )