ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump the RustSDK to v1.0.14

Browse Source
This commit is contained in:
Stefan Ceriu
2024-06-17 14:16:54 +03:00
committed by Stefan Ceriu
parent b614f43d00
commit 3bb8d668bf
6 changed files with 20 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Client/ClientProxy.swift
+1 -1
View File
@@ -820,7 +820,7 @@ class ClientProxy: ClientProxyProtocol {
private func roomTupleForIdentifier(_ identifier: String) async -> (RoomListItem?, Room?) {
do {
let roomListItem = try await roomListService?.room(roomId: identifier)
let roomListItem = try roomListService?.room(roomId: identifier)
if roomListItem?.isTimelineInitialized() == false {
try await roomListItem?.initTimeline(eventTypeFilter: eventFilters, internalIdPrefix: nil)
}
ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+9 -5
View File
@@ -200,9 +200,10 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
return updatedItems
}
private func fetchRoomInfo(roomID: String) -> RoomInfo? {
private func fetchRoomDetails(roomID: String) -> (roomInfo: RoomInfo?, latestEvent: EventTimelineItem?) {
class FetchResult {
var roomInfo: RoomInfo?
var latestEvent: EventTimelineItem?
}
let semaphore = DispatchSemaphore(value: 0)
@@ -210,7 +211,8 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
Task {
do {
let roomListItem = try await roomListService.room(roomId: roomID)
let roomListItem = try roomListService.room(roomId: roomID)
result.latestEvent = await roomListItem.latestEvent()
result.roomInfo = try await roomListItem.roomInfo()
} catch {
MXLog.error("Failed fetching room info with error: \(error)")
@@ -218,18 +220,20 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
semaphore.signal()
}
semaphore.wait()
return result.roomInfo
return (result.roomInfo, result.latestEvent)
}
private func buildRoomSummaryForIdentifier(_ identifier: String, invalidated: Bool) -> RoomSummary {
guard let roomInfo = fetchRoomInfo(roomID: identifier) else {
let roomDetails = fetchRoomDetails(roomID: identifier)
guard let roomInfo = roomDetails.roomInfo else {
return .empty
}
var attributedLastMessage: AttributedString?
var lastMessageFormattedTimestamp: String?
if let latestRoomMessage = roomInfo.latestEvent {
if let latestRoomMessage = roomDetails.latestEvent {
let lastMessage = EventTimelineItemProxy(item: latestRoomMessage, id: "0")
lastMessageFormattedTimestamp = lastMessage.timestamp.formattedMinimal()
attributedLastMessage = eventStringBuilder.buildAttributedString(for: lastMessage)