From df02fef22e02d318bc4da095f376d8a8bc9e24b2 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 28 Nov 2022 15:02:08 +0200 Subject: [PATCH] Removed now unused loadDisplayName room proxy method --- ElementX/Sources/Services/Room/MockRoomProxy.swift | 6 +----- ElementX/Sources/Services/Room/RoomProxy.swift | 14 -------------- .../Sources/Services/Room/RoomProxyProtocol.swift | 4 ---- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/ElementX/Sources/Services/Room/MockRoomProxy.swift b/ElementX/Sources/Services/Room/MockRoomProxy.swift index 1c157b4b1..05d451160 100644 --- a/ElementX/Sources/Services/Room/MockRoomProxy.swift +++ b/ElementX/Sources/Services/Room/MockRoomProxy.swift @@ -50,11 +50,7 @@ struct MockRoomProxy: RoomProxyProtocol { func displayNameForUserId(_ userId: String) -> String? { nil } - - func loadDisplayName() async -> Result { - .failure(.failedRetrievingDisplayName) - } - + func startLiveEventListener() { } func addTimelineListener(listener: TimelineListener) -> Result { diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift index afb07415f..88465c0bc 100644 --- a/ElementX/Sources/Services/Room/RoomProxy.swift +++ b/ElementX/Sources/Services/Room/RoomProxy.swift @@ -129,21 +129,7 @@ class RoomProxy: RoomProxyProtocol { return .failure(.failedRetrievingMemberDisplayName) } } - - func loadDisplayName() async -> Result { - if let displayName { return .success(displayName) } - do { - let displayName = try await Task.dispatch(on: serialDispatchQueue) { - try self.room.displayName() - } - update(displayName: displayName) - return .success(displayName) - } catch { - return .failure(.failedRetrievingDisplayName) - } - } - func addTimelineListener(listener: TimelineListener) -> Result { room.addTimelineListener(listener: listener) return .success(()) diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift index a0c328e56..dd577b387 100644 --- a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift +++ b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift @@ -18,8 +18,6 @@ import Combine import MatrixRustSDK enum RoomProxyError: Error { - case failedRetrievingDisplayName - case failedRetrievingAvatar case noMoreMessagesToBackPaginate case failedPaginatingBackwards case failedRetrievingMemberAvatarURL @@ -53,8 +51,6 @@ protocol RoomProxyProtocol { func loadDisplayNameForUserId(_ userId: String) async -> Result - func loadDisplayName() async -> Result - func addTimelineListener(listener: TimelineListener) -> Result func paginateBackwards(count: UInt) async -> Result