Bump the RustSDK, adopt latest sliding sync changes and fixes
This commit is contained in:
committed by
Stefan Ceriu
parent
b1a64f5611
commit
5a7ffa761d
@@ -4778,7 +4778,7 @@
|
||||
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
|
||||
requirement = {
|
||||
kind = exactVersion;
|
||||
version = "1.0.71-alpha";
|
||||
version = "1.0.72-alpha";
|
||||
};
|
||||
};
|
||||
96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = {
|
||||
|
||||
@@ -102,8 +102,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/matrix-org/matrix-rust-components-swift",
|
||||
"state" : {
|
||||
"revision" : "3cd19bf79bd89b71477642a1d2172f3ee48b44ef",
|
||||
"version" : "1.0.71-alpha"
|
||||
"revision" : "d0533a4ba40ff1d9ea9c6473a07639fa9b9c5079",
|
||||
"version" : "1.0.72-alpha"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -168,8 +168,13 @@ class ClientProxy: ClientProxyProtocol {
|
||||
|
||||
func stopSync() {
|
||||
MXLog.info("Stopping sync")
|
||||
slidingSync?.stopSync()
|
||||
slidingSyncObserverToken = nil
|
||||
|
||||
do {
|
||||
try slidingSync?.stopSync()
|
||||
} catch {
|
||||
MXLog.error("Failed stopping sync with error: \(error). Ignore this error if ran just before the app being suspended")
|
||||
}
|
||||
}
|
||||
|
||||
func directRoomForUserID(_ userID: String) async -> Result<String?, ClientProxyError> {
|
||||
|
||||
@@ -33,8 +33,6 @@ class RoomProxy: RoomProxyProtocol {
|
||||
|
||||
private(set) var displayName: String?
|
||||
|
||||
private var roomSubscriptionObservationToken: TaskHandle?
|
||||
private var roomUnsubscriptionObservationToken: TaskHandle?
|
||||
private var roomTimelineObservationToken: TaskHandle?
|
||||
|
||||
private let membersSubject = CurrentValueSubject<[RoomMemberProxyProtocol], Never>([])
|
||||
@@ -51,16 +49,7 @@ class RoomProxy: RoomProxyProtocol {
|
||||
deinit {
|
||||
Task { @MainActor [roomTimelineObservationToken, slidingSyncRoom] in
|
||||
roomTimelineObservationToken?.cancel()
|
||||
|
||||
let task = ExpiringTaskRunner {
|
||||
let unsubscribeTask = slidingSyncRoom.unsubscribeFromRoom()
|
||||
|
||||
while !unsubscribeTask.isFinished() {
|
||||
try await Task.sleep(for: .seconds(2))
|
||||
}
|
||||
}
|
||||
|
||||
try? await task.run(timeout: .seconds(30))
|
||||
slidingSyncRoom.unsubscribeFromRoom()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,7 +173,7 @@ class RoomProxy: RoomProxyProtocol {
|
||||
RequiredState(key: "m.room.canonical_alias", value: ""),
|
||||
RequiredState(key: "m.room.join_rules", value: "")],
|
||||
timelineLimit: UInt32(SlidingSyncConstants.timelinePrecachingTimelineLimit))
|
||||
roomSubscriptionObservationToken = slidingSyncRoom.subscribeToRoom(settings: settings)
|
||||
slidingSyncRoom.subscribeToRoom(settings: settings)
|
||||
|
||||
let timelineListener = RoomTimelineListener { [weak self] timelineDiff in
|
||||
self?.updatesSubject.send(timelineDiff)
|
||||
|
||||
@@ -43,7 +43,7 @@ include:
|
||||
packages:
|
||||
MatrixRustSDK:
|
||||
url: https://github.com/matrix-org/matrix-rust-components-swift
|
||||
exactVersion: 1.0.71-alpha
|
||||
exactVersion: 1.0.72-alpha
|
||||
# path: ../matrix-rust-sdk
|
||||
DesignKit:
|
||||
path: DesignKit
|
||||
|
||||
Reference in New Issue
Block a user