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

Bump the SDK to v25.05.26-2 and update the breaking changes following the RoomListItem removal

Browse Source
This commit is contained in:
Stefan Ceriu
2025-05-26 17:17:57 +03:00
committed by Stefan Ceriu
parent 542d382870
commit f9b3281172
13 changed files with 288 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
+3 -3
View File
@@ -29,7 +29,7 @@ struct RoomSummary {
}
}
let roomListItem: RoomListItem
let room: Room
let id: String
@@ -100,8 +100,8 @@ extension RoomSummary: CustomStringConvertible {
}
extension RoomSummary {
init(roomListItem: RoomListItem, id: String, settingsMode: RoomNotificationModeProxy, hasUnreadMessages: Bool, hasUnreadMentions: Bool, hasUnreadNotifications: Bool) {
self.roomListItem = roomListItem
init(room: Room, id: String, settingsMode: RoomNotificationModeProxy, hasUnreadMessages: Bool, hasUnreadMentions: Bool, hasUnreadNotifications: Bool) {
self.room = room
self.id = id
let string = "\(settingsMode) - messages: \(hasUnreadMessages) - mentions: \(hasUnreadMentions) - notifications: \(hasUnreadNotifications)"
name = string
ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+8 -8
View File
@@ -212,7 +212,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
return updatedItems
}
private func fetchRoomDetails(from roomListItem: RoomListItem) -> (roomInfo: RoomInfo?, latestEvent: EventTimelineItem?) {
private func fetchRoomDetails(from room: Room) -> (roomInfo: RoomInfo?, latestEvent: EventTimelineItem?) {
class FetchResult {
var roomInfo: RoomInfo?
var latestEvent: EventTimelineItem?
@@ -223,8 +223,8 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
Task {
do {
result.latestEvent = await roomListItem.latestEvent()
result.roomInfo = try await roomListItem.roomInfo()
result.latestEvent = await room.latestEvent()
result.roomInfo = try await room.roomInfo()
} catch {
MXLog.error("Failed fetching room info with error: \(error)")
}
@@ -234,11 +234,11 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
return (result.roomInfo, result.latestEvent)
}
private func buildRoomSummary(from roomListItem: RoomListItem) -> RoomSummary {
let roomDetails = fetchRoomDetails(from: roomListItem)
private func buildRoomSummary(from room: Room) -> RoomSummary {
let roomDetails = fetchRoomDetails(from: room)
guard let roomInfo = roomDetails.roomInfo else {
fatalError("Missing room info for \(roomListItem.id())")
fatalError("Missing room info for \(room.id())")
}
var attributedLastMessage: AttributedString?
@@ -263,7 +263,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
default: nil
}
return RoomSummary(roomListItem: roomListItem,
return RoomSummary(room: room,
id: roomInfo.id,
joinRequestType: joinRequestType,
name: roomInfo.displayName ?? roomInfo.id,
@@ -367,7 +367,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
MXLog.info("\(name): Rebuilding room summaries for \(rooms.count) rooms")
rooms = rooms.map {
self.buildRoomSummary(from: $0.roomListItem)
self.buildRoomSummary(from: $0.room)
}
MXLog.info("\(name): Finished rebuilding room summaries (\(rooms.count) rooms)")