From f56b060250f48266bf1e865d892cc61e93702fee Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 26 May 2025 10:12:10 +0300 Subject: [PATCH] Stop relying on the room list service and its items when retrieving room from the ClientProxy --- .../Sources/Services/Client/ClientProxy.swift | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift index edae37d8e..872871956 100644 --- a/ElementX/Sources/Services/Client/ClientProxy.swift +++ b/ElementX/Sources/Services/Client/ClientProxy.swift @@ -904,33 +904,20 @@ class ClientProxy: ClientProxyProtocol { private func buildRoomForIdentifier(_ roomID: String) async -> RoomProxyType? { do { - let roomListItem = try roomListService.room(roomId: roomID) + guard let room = try client.getRoom(roomId: roomID) else { + return nil + } - switch roomListItem.membership() { + switch room.membership() { case .invited: - guard let room = try client.getRoom(roomId: roomID) else { - MXLog.error("Could not find room with ID: \(roomID)") - return nil - } - return try await .invited(InvitedRoomProxy(room: room)) case .knocked: guard appSettings.knockingEnabled else { return nil } - guard let room = try client.getRoom(roomId: roomID) else { - MXLog.error("Could not find room with ID: \(roomID)") - return nil - } - return try await .knocked(KnockedRoomProxy(room: room)) case .joined: - guard let room = try client.getRoom(roomId: roomID) else { - MXLog.error("Could not find room with ID: \(roomID)") - return nil - } - let roomProxy = try await JoinedRoomProxy(roomListService: roomListService, room: room)