ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-06 12:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort incoming messages client side, workaround backward stream issues (revisit later with new Rust implementation).

Browse Source
This commit is contained in:
Stefan Ceriu
2022-03-24 14:48:38 +02:00
parent cf42d61d27
commit 762b497940
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Room/RoomProxy.swift
+4 -1
View File
@@ -151,10 +151,13 @@ class RoomProxy: RoomProxyProtocol, Equatable {
return return
} }
let messages = backwardStream.paginateBackwards(count: UInt64(count)).map { message in var messages = backwardStream.paginateBackwards(count: UInt64(count)).map { message in
self.messageFactory.buildRoomMessageFrom(message) self.messageFactory.buildRoomMessageFrom(message)
} }
// FIXME: Something wrong on the Rust side and these come in out of order sometimes.
messages = messages.sorted(by: { $0.originServerTs < $1.originServerTs })
DispatchQueue.main.async { DispatchQueue.main.async {
callback?(.success(messages)) callback?(.success(messages))
if self.lastMessage == nil { if self.lastMessage == nil {
ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
+1 -1
View File
@@ -36,7 +36,7 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
self.roomProxy.paginateBackwards(count: count) { result in self.roomProxy.paginateBackwards(count: count) { result in
switch result { switch result {
case .success(let messages): case .success(let messages):
self.messages.insert(contentsOf: messages.reversed(), at: 0) self.messages.insert(contentsOf: messages, at: 0)
callback?(.success((self.messages))) callback?(.success((self.messages)))
case .failure: case .failure:
callback?(.failure(.generic)) callback?(.failure(.generic))