From ef97844a95fc383de397df378abd06dda61e5c2f Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Thu, 2 Mar 2023 16:41:06 +0200 Subject: [PATCH] Bump the Rust SDK to 1.0.42-alpha, fix breaking changes --- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- .../Sources/Services/Client/ClientProxy.swift | 14 +++++++------- .../Services/Client/SlidingSyncViewProxy.swift | 18 +++++++++--------- .../Room/RoomSummary/RoomSummaryProvider.swift | 4 ++-- project.yml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4f6808a42..f80659ec0 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -95,8 +95,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/matrix-org/matrix-rust-components-swift", "state" : { - "revision" : "6cf248cfdf11237ae988f6e7ee11f273c551860a", - "version" : "1.0.41-alpha" + "revision" : "852bb356fbd2b5053f17b3c6c27c8c098cf5f055", + "version" : "1.0.42-alpha" } }, { diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift index cba100233..bc86f5893 100644 --- a/ElementX/Sources/Services/Client/ClientProxy.swift +++ b/ElementX/Sources/Services/Client/ClientProxy.swift @@ -58,10 +58,10 @@ class ClientProxy: ClientProxyProtocol { private var slidingSyncObserverToken: TaskHandle? private var slidingSync: SlidingSync? - var visibleRoomsSlidingSyncView: SlidingSyncView? + var visibleRoomsSlidingSyncView: SlidingSyncList? var visibleRoomsSummaryProvider: RoomSummaryProviderProtocol? - var allRoomsSlidingSyncView: SlidingSyncView? + var allRoomsSlidingSyncView: SlidingSyncList? var allRoomsSummaryProvider: RoomSummaryProviderProtocol? private var cancellables = Set() @@ -258,7 +258,7 @@ class ClientProxy: ClientProxyProtocol { // Build the visibleRoomsSlidingSyncView here so that it can take advantage of the SS builder cold cache // We will still register the allRoomsSlidingSyncView later, and than will have no cache - let visibleRoomsView = try SlidingSyncViewBuilder() + let visibleRoomsView = try SlidingSyncListBuilder() .timelineLimit(limit: UInt32(SlidingSyncConstants.initialTimelineLimit)) // Starts off with zero to quickly load rooms, then goes to 1 while scrolling to quickly load last messages and 20 when the scrolling stops to load room history .requiredState(requiredState: slidingSyncRequiredState) .filters(filters: slidingSyncFilters) @@ -269,7 +269,7 @@ class ClientProxy: ClientProxyProtocol { .build() let slidingSync = try slidingSyncBuilder - .addView(v: visibleRoomsView) + .addList(v: visibleRoomsView) .withCommonExtensions() .coldCache(name: "ElementX") .build() @@ -285,7 +285,7 @@ class ClientProxy: ClientProxyProtocol { } } - private func buildAndConfigureVisibleRoomsSlidingSyncView(slidingSync: SlidingSyncProtocol, visibleRoomsView: SlidingSyncView) { + private func buildAndConfigureVisibleRoomsSlidingSyncView(slidingSync: SlidingSyncProtocol, visibleRoomsView: SlidingSyncList) { let visibleRoomsViewProxy = SlidingSyncViewProxy(slidingSync: slidingSync, slidingSyncView: visibleRoomsView) visibleRoomsSummaryProvider = RoomSummaryProvider(slidingSyncViewProxy: visibleRoomsViewProxy, @@ -313,7 +313,7 @@ class ClientProxy: ClientProxyProtocol { } do { - let allRoomsView = try SlidingSyncViewBuilder() + let allRoomsView = try SlidingSyncListBuilder() .noTimelineLimit() .requiredState(requiredState: slidingSyncRequiredState) .filters(filters: slidingSyncFilters) @@ -359,7 +359,7 @@ class ClientProxy: ClientProxyProtocol { if let allRoomsSlidingSyncView { MXLog.info("Registering all rooms view") - _ = slidingSync?.addView(view: allRoomsSlidingSyncView) + _ = slidingSync?.addList(list: allRoomsSlidingSyncView) } else { MXLog.error("All rooms sliding sync view unavailable") } diff --git a/ElementX/Sources/Services/Client/SlidingSyncViewProxy.swift b/ElementX/Sources/Services/Client/SlidingSyncViewProxy.swift index 75b4bbafd..a6a895af0 100644 --- a/ElementX/Sources/Services/Client/SlidingSyncViewProxy.swift +++ b/ElementX/Sources/Services/Client/SlidingSyncViewProxy.swift @@ -18,9 +18,9 @@ import Combine import Foundation import MatrixRustSDK -private class SlidingSyncViewObserver: SlidingSyncViewRoomListObserver, SlidingSyncViewStateObserver, SlidingSyncViewRoomsCountObserver { +private class SlidingSyncViewObserver: SlidingSyncListRoomListObserver, SlidingSyncListStateObserver, SlidingSyncListRoomsCountObserver { /// Publishes room list diffs as they come in through sliding sync - let roomListDiffPublisher = PassthroughSubject() + let roomListDiffPublisher = PassthroughSubject() /// Publishes the current state of sliding sync, such as whether its catching up or live. let stateUpdatePublisher = CurrentValueSubject(.cold) @@ -28,21 +28,21 @@ private class SlidingSyncViewObserver: SlidingSyncViewRoomListObserver, SlidingS /// Publishes the number of available rooms let countUpdatePublisher = CurrentValueSubject(0) - // MARK: - SlidingSyncViewRoomListObserver + // MARK: - SlidingSyncListRoomListObserver - func didReceiveUpdate(diff: SlidingSyncViewRoomsListDiff) { + func didReceiveUpdate(diff: SlidingSyncListRoomsListDiff) { MXLog.verbose("Received room diff") roomListDiffPublisher.send(diff) } - // MARK: - SlidingSyncViewStateObserver + // MARK: - SlidingSyncListStateObserver func didReceiveUpdate(newState: SlidingSyncState) { MXLog.info("Updated state: \(newState)") stateUpdatePublisher.send(newState) } - // MARK: - SlidingSyncViewRoomsCountObserver + // MARK: - SlidingSyncListRoomsCountObserver func didReceiveUpdate(count: UInt32) { MXLog.info("Updated room count: \(count)") @@ -52,7 +52,7 @@ private class SlidingSyncViewObserver: SlidingSyncViewRoomListObserver, SlidingS class SlidingSyncViewProxy { private let slidingSync: SlidingSyncProtocol - private let slidingSyncView: SlidingSyncViewProtocol + private let slidingSyncView: SlidingSyncListProtocol private var listUpdateObserverToken: TaskHandle? private var stateUpdateObserverToken: TaskHandle? @@ -60,7 +60,7 @@ class SlidingSyncViewProxy { private var cancellables = Set() - let diffPublisher = PassthroughSubject() + let diffPublisher = PassthroughSubject() let statePublisher = PassthroughSubject() let countPublisher = PassthroughSubject() let visibleRangeUpdatePublisher = PassthroughSubject() @@ -71,7 +71,7 @@ class SlidingSyncViewProxy { countUpdateObserverToken?.cancel() } - init(slidingSync: SlidingSyncProtocol, slidingSyncView: SlidingSyncViewProtocol) { + init(slidingSync: SlidingSyncProtocol, slidingSyncView: SlidingSyncListProtocol) { self.slidingSync = slidingSync self.slidingSyncView = slidingSyncView diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift index db67740db..b93807b5a 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift @@ -67,7 +67,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { // MARK: - Private - fileprivate func updateRoomsWithDiffs(_ diffs: [SlidingSyncViewRoomsListDiff]) { + fileprivate func updateRoomsWithDiffs(_ diffs: [SlidingSyncListRoomsListDiff]) { MXLog.info("Received \(diffs.count) diffs") rooms = diffs @@ -136,7 +136,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { } // swiftlint:disable:next cyclomatic_complexity function_body_length - private func buildDiff(from diff: SlidingSyncViewRoomsListDiff, on rooms: [RoomSummary]) -> CollectionDifference? { + private func buildDiff(from diff: SlidingSyncListRoomsListDiff, on rooms: [RoomSummary]) -> CollectionDifference? { var changes = [CollectionDifference.Change]() switch diff { diff --git a/project.yml b/project.yml index 97845e76f..64458e6bb 100644 --- a/project.yml +++ b/project.yml @@ -40,7 +40,7 @@ include: packages: MatrixRustSDK: url: https://github.com/matrix-org/matrix-rust-components-swift - exactVersion: 1.0.41-alpha + exactVersion: 1.0.42-alpha # path: ../matrix-rust-sdk DesignKit: path: DesignKit