ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-05 20:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed manual message sorting after rust sdk fix.

Browse Source
This commit is contained in:
Stefan Ceriu
2022-03-29 18:04:19 +03:00
parent c4e5689272
commit 4053841e2f
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Colors.swift
+1 -1
View File
@@ -10,7 +10,7 @@ import Foundation
import UIKit import UIKit
import SwiftUI import SwiftUI
//TODO: Switch this to SwiftGen // TODO: Switch this to SwiftGen
extension Color { extension Color {
static let elementGreen = Color(ColorNames.elementGreen.rawValue) static let elementGreen = Color(ColorNames.elementGreen.rawValue)
ElementX/Sources/Services/Room/RoomProxy.swift
+2 -5
View File
@@ -151,14 +151,11 @@ class RoomProxy: RoomProxyProtocol, Equatable {
return 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) self.messageFactory.buildRoomMessageFrom(message)
} }
// FIXME: Something wrong on the Rust side and these come in out of order sometimes. DispatchQueue.main.async {
messages = messages.sorted(by: { $0.originServerTs < $1.originServerTs })
DispatchQueue.main.async {
callback?(.success(messages)) callback?(.success(messages))
if self.lastMessage == nil { if self.lastMessage == nil {
self.lastMessage = messages.last?.body ?? "" self.lastMessage = messages.last?.body ?? ""
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, at: 0) self.messages.insert(contentsOf: messages.reversed(), at: 0)
callback?(.success((self.messages))) callback?(.success((self.messages)))
case .failure: case .failure:
callback?(.failure(.generic)) callback?(.failure(.generic))