From 4053841e2f703bb1d5031d7136c34df45715c79e Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 29 Mar 2022 18:04:19 +0300 Subject: [PATCH] Removed manual message sorting after rust sdk fix. --- ElementX/Sources/Other/Colors.swift | 2 +- ElementX/Sources/Services/Room/RoomProxy.swift | 7 ++----- .../Sources/Services/Timeline/RoomTimelineProvider.swift | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ElementX/Sources/Other/Colors.swift b/ElementX/Sources/Other/Colors.swift index af1d3aa58..b72aeec3a 100644 --- a/ElementX/Sources/Other/Colors.swift +++ b/ElementX/Sources/Other/Colors.swift @@ -10,7 +10,7 @@ import Foundation import UIKit import SwiftUI -//TODO: Switch this to SwiftGen +// TODO: Switch this to SwiftGen extension Color { static let elementGreen = Color(ColorNames.elementGreen.rawValue) diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift index 140d9944b..db32f7077 100644 --- a/ElementX/Sources/Services/Room/RoomProxy.swift +++ b/ElementX/Sources/Services/Room/RoomProxy.swift @@ -151,14 +151,11 @@ class RoomProxy: RoomProxyProtocol, Equatable { return } - var messages = backwardStream.paginateBackwards(count: UInt64(count)).map { message in + let messages = backwardStream.paginateBackwards(count: UInt64(count)).map { message in 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)) if self.lastMessage == nil { self.lastMessage = messages.last?.body ?? "" diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift b/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift index b435e41e5..9f945f59a 100644 --- a/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift +++ b/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift @@ -36,7 +36,7 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol { self.roomProxy.paginateBackwards(count: count) { result in switch result { case .success(let messages): - self.messages.insert(contentsOf: messages, at: 0) + self.messages.insert(contentsOf: messages.reversed(), at: 0) callback?(.success((self.messages))) case .failure: callback?(.failure(.generic))