Start using the new (faster) RoomInfo record to populate the room and invite lists

ElementX.xcodeproj/project.pbxproj

@@ -1029,6 +1029,7 @@
 		47F29139BC2A804CE5E0757E /* MediaUploadPreviewScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadPreviewScreenViewModel.swift; sourceTree = "<group>"; };
 		4959CECEC984B3995616F427 /* DataProtectionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataProtectionManager.swift; sourceTree = "<group>"; };
 		49D2C8E66E83EA578A7F318A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		49E6066092ED45E36BB306F7 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		49E751D7EDB6043238111D90 /* UNNotificationRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UNNotificationRequest.swift; sourceTree = "<group>"; };
 		4A4AD793D50748F8997E5B15 /* TimelineItemMacContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemMacContextMenu.swift; sourceTree = "<group>"; };
 		4AB7D7DAAAF662DED9D02379 /* MockMediaLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockMediaLoader.swift; sourceTree = "<group>"; };
@@ -1217,6 +1218,7 @@
 		8FC803282F9268D49F4ABF14 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
 		90A55430639712CFACA34F43 /* TextRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineItem.swift; sourceTree = "<group>"; };
 		90F2F8998E5632668B0AD848 /* RoomTimelineItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemView.swift; sourceTree = "<group>"; };
+		91CF6F7D08228D16BA69B63B /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		923485F85E1D765EF9D20E88 /* UserProfileCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileCell.swift; sourceTree = "<group>"; };
 		92390F9FA98255440A6BF5F8 /* OIDCAuthenticationPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OIDCAuthenticationPresenter.swift; sourceTree = "<group>"; };
 		92FCD9116ADDE820E4E30F92 /* UIKitBackgroundTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitBackgroundTask.swift; sourceTree = "<group>"; };
@@ -3949,6 +3951,7 @@
 				ro,
 				ru,
 				sk,
+				"zh-Hant-TW",
 			);
 			mainGroup = 405B00F139AEE3994601B36A;
 			packageReferences = (
@@ -4906,6 +4909,7 @@
 				E9D059BFE329BE09B6D96A9F /* ro */,
 				E5F2B6443D1ED8602F328539 /* ru */,
 				667DD3A9D932D7D9EB380CAA /* sk */,
+				49E6066092ED45E36BB306F7 /* zh-Hant-TW */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -4922,6 +4926,7 @@
 				33E49C5C6F802B4D94CA78D1 /* ro */,
 				E8294DB9E95C0C0630418466 /* ru */,
 				AD378D580A41E42560C60E9C /* sk */,
+				91CF6F7D08228D16BA69B63B /* zh-Hant-TW */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -5460,7 +5465,7 @@
 			repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = "1.0.107-alpha";
+				version = "1.0.108-alpha";
 			};
 		};
 		821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -129,8 +129,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "28211915a5a5ca926798d12bedc3bf1a352714fd",
+        "revision" : "3166b3e6d35779aa78025a0b9143def6a7ee1c51",
-        "version" : "1.0.107-alpha"
+        "version" : "1.0.108-alpha"
       }
     },
     {

ElementX/Sources/Screens/InvitesScreen/InvitesScreenModels.swift

@@ -21,10 +21,6 @@ enum InvitesScreenViewModelAction {
 struct InvitesScreenViewState: BindableState {
     var invites: [InvitesScreenRoomDetails] = []
     var bindings: InvitesScreenViewStateBindings = .init()
-
-    // ideally we wanted to derive this state from `invites` being `Optional.none`.
-    // But we needed to make it a non optional array due to a strange crash in release builds (https://github.com/vector-im/element-x-ios/pull/1120)
-    var isLoading = true
 }
 
 struct InvitesScreenViewStateBindings {
@@ -33,7 +29,6 @@ struct InvitesScreenViewStateBindings {
 
 struct InvitesScreenRoomDetails: Identifiable {
     let roomDetails: RoomSummaryDetails
-    var inviter: RoomMemberProxyProtocol?
     var isUnread: Bool
     
     var isDirect: Bool {

ElementX/Sources/Screens/InvitesScreen/InvitesScreenViewModel.swift

@@ -28,7 +28,6 @@ class InvitesScreenViewModel: InvitesScreenViewModelType, InvitesScreenViewModel
     
     private let previouslySeenInvites: Set<String>
     private let actionsSubject: PassthroughSubject<InvitesScreenViewModelAction, Never> = .init()
-    @CancellableTask private var fetchInvitersTask: Task<Void, Never>?
 
     var actions: AnyPublisher<InvitesScreenViewModelAction, Never> {
         actionsSubject.eraseToAnyPublisher()
@@ -84,57 +83,21 @@ class InvitesScreenViewModel: InvitesScreenViewModelType, InvitesScreenViewModel
             .sink { [weak self] roomSummaries in
                 guard let self else { return }
                 
-                fetchInvitersTask = Task { [weak self] in
+                let invites: [InvitesScreenRoomDetails] = roomSummaries.compactMap { summary in
-                    guard let self else { return }
+                    guard case .filled(let details) = summary else {
-                    let fullInvites = await self.buildInvites(from: roomSummaries)
+                        return nil
-                    guard !Task.isCancelled else { return }
+                    }
-                    self.state.invites = fullInvites
+                    return InvitesScreenRoomDetails(roomDetails: details, isUnread: !self.previouslySeenInvites.contains(details.id))
-                    self.state.isLoading = false
-                    self.appSettings.seenInvites = Set(fullInvites.map(\.roomDetails.id))
                 }
+                
+                self.state.invites = invites
+                self.appSettings.seenInvites = Set(invites.map(\.roomDetails.id))
             }
             .store(in: &cancellables)
     }
 
-    private func buildInvites(from summaries: [RoomSummary]) async -> [InvitesScreenRoomDetails] {
-        await Task.detached {
-            let invites: [InvitesScreenRoomDetails] = summaries.compactMap { summary in
-                guard case .filled(let details) = summary else {
-                    return nil
-                }
-                return InvitesScreenRoomDetails(roomDetails: details, isUnread: !self.previouslySeenInvites.contains(details.id))
-            }
-
-            // fetch the inviters...
-            return await withTaskGroup(of: (Int, RoomMemberProxyProtocol)?.self) { [clientProxy = self.clientProxy] group in
-                var invitesWithInviters = invites
-
-                for inviteIndex in 0..<invites.count {
-                    group.addTask {
-                        let roomID = invites[inviteIndex].roomDetails.id
-                        guard let inviter = await clientProxy.roomForIdentifier(roomID)?.inviter() else {
-                            return nil
-                        }
-                        return (inviteIndex, inviter)
-                    }
-                }
-
-                for await result in group {
-                    guard let (inviteIndex, inviter) = result else {
-                        continue
-                    }
-
-                    invitesWithInviters[inviteIndex].inviter = inviter
-                }
-
-                return invitesWithInviters
-            }
-        }
-        .value
-    }
-
     private func startDeclineFlow(invite: InvitesScreenRoomDetails) {
-        let roomPlaceholder = invite.isDirect ? (invite.inviter?.displayName ?? invite.roomDetails.name) : invite.roomDetails.name
+        let roomPlaceholder = invite.isDirect ? (invite.roomDetails.inviter?.displayName ?? invite.roomDetails.name) : invite.roomDetails.name
         let title = invite.isDirect ? L10n.screenInvitesDeclineDirectChatTitle : L10n.screenInvitesDeclineChatTitle
         let message = invite.isDirect ? L10n.screenInvitesDeclineDirectChatMessage(roomPlaceholder) : L10n.screenInvitesDeclineChatMessage(roomPlaceholder)
         

ElementX/Sources/Screens/InvitesScreen/View/InvitesScreen.swift

@@ -20,17 +20,11 @@ struct InvitesScreen: View {
     @ObservedObject var context: InvitesScreenViewModel.Context
     
     var body: some View {
-        Group {
+        mainContent
-            if context.viewState.isLoading {
+            .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
-                ProgressView()
+            .navigationTitle(L10n.actionInvitesList)
-            } else {
+            .alert(item: $context.alertInfo)
-                mainContent
+            .track(screen: .invites)
-            }
-        }
-        .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
-        .navigationTitle(L10n.actionInvitesList)
-        .alert(item: $context.alertInfo)
-        .track(screen: .invites)
     }
     
     // MARK: - Private

ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift

@@ -71,9 +71,9 @@ struct InvitesScreenCell: View {
 
     @ViewBuilder
     private var inviterView: some View {
-        if let invitedText = attributedInviteText, let name = invite.inviter?.displayName {
+        if let invitedText = attributedInviteText, let name = invite.roomDetails.inviter?.displayName {
             HStack(alignment: .firstTextBaseline) {
-                LoadableAvatarImage(url: invite.inviter?.avatarURL,
+                LoadableAvatarImage(url: invite.roomDetails.inviter?.avatarURL,
                                     name: name,
                                     contentID: name,
                                     avatarSize: .custom(16),
@@ -125,14 +125,14 @@ struct InvitesScreenCell: View {
     }
     
     private var subtitle: String? {
-        invite.isDirect ? invite.inviter?.userID : invite.roomDetails.canonicalAlias
+        invite.isDirect ? invite.roomDetails.inviter?.userID : invite.roomDetails.canonicalAlias
     }
     
     private var attributedInviteText: AttributedString? {
         guard
             invite.roomDetails.isDirect == false,
-            let inviterName = invite.inviter?.displayName,
+            let inviterName = invite.roomDetails.inviter?.displayName,
-            let inviterID = invite.inviter?.userID
+            let inviterID = invite.roomDetails.inviter?.userID
         else {
             return nil
         }
@@ -178,6 +178,10 @@ struct InvitesScreenCell_Previews: PreviewProvider {
 @MainActor
 private extension InvitesScreenRoomDetails {
     static var dm: InvitesScreenRoomDetails {
+        let inviter = RoomMemberProxyMock()
+        inviter.displayName = "Jack"
+        inviter.userID = "@jack:somewhere.com"
+        
         let dmRoom = RoomSummaryDetails(id: "@someone:somewhere.com",
                                         name: "Some Guy",
                                         isDirect: true,
@@ -185,15 +189,17 @@ private extension InvitesScreenRoomDetails {
                                         lastMessage: nil,
                                         lastMessageFormattedTimestamp: nil,
                                         unreadNotificationCount: 0,
-                                        canonicalAlias: "#footest:somewhere.org")
+                                        canonicalAlias: "#footest:somewhere.org",
-        let inviter = RoomMemberProxyMock()
+                                        inviter: inviter)
-        inviter.displayName = "Jack"
+        return .init(roomDetails: dmRoom, isUnread: false)
-        inviter.userID = "@jack:somewhere.com"
-        
-        return .init(roomDetails: dmRoom, inviter: inviter, isUnread: false)
     }
     
     static func room(alias: String? = nil, avatarURL: URL? = nil, isUnread: Bool = true) -> InvitesScreenRoomDetails {
+        let inviter = RoomMemberProxyMock()
+        inviter.displayName = "Luca"
+        inviter.userID = "@jack:somewhi.nl"
+        inviter.avatarURL = avatarURL
+        
         let dmRoom = RoomSummaryDetails(id: "@someone:somewhere.com",
                                         name: "Awesome Room",
                                         isDirect: false,
@@ -201,12 +207,8 @@ private extension InvitesScreenRoomDetails {
                                         lastMessage: nil,
                                         lastMessageFormattedTimestamp: nil,
                                         unreadNotificationCount: 0,
-                                        canonicalAlias: alias)
+                                        canonicalAlias: alias,
-        let inviter = RoomMemberProxyMock()
+                                        inviter: inviter)
-        inviter.displayName = "Luca"
+        return .init(roomDetails: dmRoom, isUnread: isUnread)
-        inviter.userID = "@jack:somewhi.nl"
-        inviter.avatarURL = avatarURL
-        
-        return .init(roomDetails: dmRoom, inviter: inviter, isUnread: isUnread)
     }
 }

ElementX/Sources/Services/Client/ClientProxy.swift

@@ -399,12 +399,14 @@ class ClientProxy: ClientProxyProtocol {
             roomSummaryProvider = RoomSummaryProvider(roomListService: roomListService,
                                                       eventStringBuilder: eventStringBuilder,
                                                       name: "AllRooms",
-                                                      appSettings: appSettings)
+                                                      appSettings: appSettings,
+                                                      backgroundTaskService: backgroundTaskService)
             try await roomSummaryProvider?.setRoomList(roomListService.allRooms())
             inviteSummaryProvider = RoomSummaryProvider(roomListService: roomListService,
                                                         eventStringBuilder: eventStringBuilder,
                                                         name: "Invites",
-                                                        appSettings: appSettings)
+                                                        appSettings: appSettings,
+                                                        backgroundTaskService: backgroundTaskService)
 
             self.syncService = syncService
             self.roomListService = roomListService

ElementX/Sources/Services/Room/RoomSummary/MockRoomSummaryProvider.swift

@@ -57,7 +57,8 @@ extension Array where Element == RoomSummary {
                                             lastMessage: AttributedString("Prosciutto beef ribs pancetta filet mignon kevin hamburger, chuck ham venison picanha. Beef ribs chislic turkey biltong tenderloin."),
                                             lastMessageFormattedTimestamp: "Now",
                                             unreadNotificationCount: 4,
-                                            canonicalAlias: nil)),
+                                            canonicalAlias: nil,
+                                            inviter: nil)),
         .filled(details: RoomSummaryDetails(id: "2",
                                             name: "Second room",
                                             isDirect: true,
@@ -65,7 +66,8 @@ extension Array where Element == RoomSummary {
                                             lastMessage: nil,
                                             lastMessageFormattedTimestamp: nil,
                                             unreadNotificationCount: 1,
-                                            canonicalAlias: nil)),
+                                            canonicalAlias: nil,
+                                            inviter: nil)),
         .filled(details: RoomSummaryDetails(id: "3",
                                             name: "Third room",
                                             isDirect: true,
@@ -73,7 +75,8 @@ extension Array where Element == RoomSummary {
                                             lastMessage: try? AttributedString(markdown: "**@mock:client.com**: T-bone beef ribs bacon"),
                                             lastMessageFormattedTimestamp: "Later",
                                             unreadNotificationCount: 0,
-                                            canonicalAlias: nil)),
+                                            canonicalAlias: nil,
+                                            inviter: nil)),
         .empty
     ]
     
@@ -84,7 +87,8 @@ extension Array where Element == RoomSummary {
                                             lastMessage: nil,
                                             lastMessageFormattedTimestamp: nil,
                                             unreadNotificationCount: 0,
-                                            canonicalAlias: "#footest:somewhere.org")),
+                                            canonicalAlias: "#footest:somewhere.org",
+                                            inviter: nil)),
         .filled(details: RoomSummaryDetails(id: "someAwesomeRoomId2",
                                             name: "Second room",
                                             isDirect: true,
@@ -92,6 +96,7 @@ extension Array where Element == RoomSummary {
                                             lastMessage: nil,
                                             lastMessageFormattedTimestamp: nil,
                                             unreadNotificationCount: 0,
-                                            canonicalAlias: nil))
+                                            canonicalAlias: nil,
+                                            inviter: nil))
     ]
 }

ElementX/Sources/Services/Room/RoomSummary/RoomSummaryDetails.swift

@@ -15,6 +15,7 @@
 //
 
 import Foundation
+import MatrixRustSDK
 
 struct RoomSummaryDetails {
     let id: String
@@ -25,6 +26,7 @@ struct RoomSummaryDetails {
     let lastMessageFormattedTimestamp: String?
     let unreadNotificationCount: UInt
     let canonicalAlias: String?
+    let inviter: RoomMemberProxyProtocol?
 }
 
 extension RoomSummaryDetails: CustomStringConvertible {

ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift

@@ -23,6 +23,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
     private let eventStringBuilder: RoomEventStringBuilder
     private let name: String
     private var appSettings: AppSettings
+    private let backgroundTaskService: BackgroundTaskServiceProtocol
     
     private let serialDispatchQueue: DispatchQueue
     
@@ -56,12 +57,14 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
     init(roomListService: RoomListServiceProtocol,
          eventStringBuilder: RoomEventStringBuilder,
          name: String,
-         appSettings: AppSettings) {
+         appSettings: AppSettings,
+         backgroundTaskService: BackgroundTaskServiceProtocol) {
         self.roomListService = roomListService
         serialDispatchQueue = DispatchQueue(label: "io.element.elementx.roomsummaryprovider", qos: .utility)
         self.eventStringBuilder = eventStringBuilder
         self.name = name
         self.appSettings = appSettings
+        self.backgroundTaskService = backgroundTaskService
         
         diffsPublisher
             .receive(on: serialDispatchQueue)
@@ -155,20 +158,24 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
         MXLog.info("\(name): Finished applying \(diffs.count) diffs, new room list \(rooms.compactMap { $0.id ?? "Empty" })")
     }
 
-    private func fetchLastMessage(roomListItem: RoomListItemProtocol) -> EventTimelineItem? {
+    private func fetchRoomInfo(roomListItem: RoomListItemProtocol) -> RoomInfo? {
         class FetchResult {
-            var latestRoomEvent: EventTimelineItem?
+            var roomInfo: RoomInfo?
         }
 
         let semaphore = DispatchSemaphore(value: 0)
         let result = FetchResult()
 
         Task {
-            result.latestRoomEvent = await roomListItem.latestEvent()
+            do {
+                result.roomInfo = try await roomListItem.roomInfo()
+            } catch {
+                MXLog.error("Failed fetching room info with error: \(error)")
+            }
             semaphore.signal()
         }
         semaphore.wait()
-        return result.latestRoomEvent
+        return result.roomInfo
     }
 
     private func buildRoomSummaryForIdentifier(_ identifier: String, invalidated: Bool) -> RoomSummary {
@@ -177,23 +184,33 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
             return .empty
         }
         
+        guard let roomInfo = fetchRoomInfo(roomListItem: roomListItem) else {
+            return .empty
+        }
+        
         var attributedLastMessage: AttributedString?
         var lastMessageFormattedTimestamp: String?
         
-        if let latestRoomMessage = fetchLastMessage(roomListItem: roomListItem) {
+        if let latestRoomMessage = roomInfo.latestEvent {
             let lastMessage = EventTimelineItemProxy(item: latestRoomMessage, id: 0)
             lastMessageFormattedTimestamp = lastMessage.timestamp.formattedMinimal()
             attributedLastMessage = eventStringBuilder.buildAttributedString(for: lastMessage)
         }
         
-        let details = RoomSummaryDetails(id: roomListItem.id(),
+        var inviterProxy: RoomMemberProxyProtocol?
-                                         name: roomListItem.name() ?? roomListItem.id(),
+        if let inviter = roomInfo.inviter {
-                                         isDirect: roomListItem.isDirect(),
+            inviterProxy = RoomMemberProxy(member: inviter, backgroundTaskService: backgroundTaskService)
-                                         avatarURL: roomListItem.avatarUrl().flatMap(URL.init(string:)),
+        }
+        
+        let details = RoomSummaryDetails(id: roomInfo.id,
+                                         name: roomInfo.name ?? roomInfo.id,
+                                         isDirect: roomInfo.isDirect,
+                                         avatarURL: roomInfo.avatarUrl.flatMap(URL.init(string:)),
                                          lastMessage: attributedLastMessage,
                                          lastMessageFormattedTimestamp: lastMessageFormattedTimestamp,
-                                         unreadNotificationCount: UInt(roomListItem.unreadNotifications().notificationCount()),
+                                         unreadNotificationCount: UInt(roomInfo.notificationCount),
-                                         canonicalAlias: roomListItem.canonicalAlias())
+                                         canonicalAlias: roomInfo.canonicalAlias,
+                                         inviter: inviterProxy)
         
         return invalidated ? .invalidated(details: details) : .filled(details: details)
     }

project.yml

@@ -45,7 +45,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.0.107-alpha
+    exactVersion: 1.0.108-alpha
     # path: ../matrix-rust-sdk
   DesignKit:
     path: DesignKit