mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +00:00
Stop relying on the room list service and its items when retrieving room from the ClientProxy
This commit is contained in:
committed by
Stefan Ceriu
parent
ccf437f5fb
commit
4adfa7c98d
@@ -904,33 +904,20 @@ class ClientProxy: ClientProxyProtocol {
|
|||||||
|
|
||||||
private func buildRoomForIdentifier(_ roomID: String) async -> RoomProxyType? {
|
private func buildRoomForIdentifier(_ roomID: String) async -> RoomProxyType? {
|
||||||
do {
|
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:
|
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))
|
return try await .invited(InvitedRoomProxy(room: room))
|
||||||
case .knocked:
|
case .knocked:
|
||||||
guard appSettings.knockingEnabled else {
|
guard appSettings.knockingEnabled else {
|
||||||
return nil
|
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))
|
return try await .knocked(KnockedRoomProxy(room: room))
|
||||||
case .joined:
|
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,
|
let roomProxy = try await JoinedRoomProxy(roomListService: roomListService,
|
||||||
room: room)
|
room: room)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user