From e1d2c1d4158c03b6191740ae3082224927432581 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 24 Feb 2026 16:29:30 +0000 Subject: [PATCH] Update the SDK. (#5141) --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 7 +- .../Other/Extensions/ClientBuilder.swift | 2 +- .../Sources/Services/Client/ClientProxy.swift | 1 - .../Sources/Generated/SDKGeneratedMocks.swift | 186 +++++++++--------- project.yml | 2 +- 6 files changed, 103 insertions(+), 97 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 1a3bc80f6..78ccefe05 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -9829,7 +9829,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.02.13; + version = 26.02.24; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 92c104eeb..dadf9a09f 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "535c4d88d082716c37209d98cfd37fe407a0e04be32c7557518b5055b6accb3b", "pins" : [ { "identity" : "compound-design-tokens", @@ -158,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "113131fa5f779a22319b61525c3126ba63045fa0", - "version" : "26.2.13" + "revision" : "4773764d92fb0a3a212b39bc54cd8399d43d482e", + "version" : "26.2.24" } }, { @@ -361,5 +362,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/ElementX/Sources/Other/Extensions/ClientBuilder.swift b/ElementX/Sources/Other/Extensions/ClientBuilder.swift index ac39b93d0..5a887cc70 100644 --- a/ElementX/Sources/Other/Extensions/ClientBuilder.swift +++ b/ElementX/Sources/Other/Extensions/ClientBuilder.swift @@ -22,7 +22,7 @@ extension ClientBuilder { maxRequestRetryTime: UInt64? = nil, threadsEnabled: Bool) -> ClientBuilder { var builder = ClientBuilder() - .crossProcessStoreLocksHolderName(holderName: InfoPlistReader.main.bundleIdentifier) + .crossProcessLockConfig(crossProcessLockConfig: .multiProcess(holderName: InfoPlistReader.main.bundleIdentifier)) .enableOidcRefreshLock() .setSessionDelegate(sessionDelegate: sessionDelegate) .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent()) diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift index 80a18b510..a42b2dd65 100644 --- a/ElementX/Sources/Services/Client/ClientProxy.swift +++ b/ElementX/Sources/Services/Client/ClientProxy.swift @@ -1325,7 +1325,6 @@ private struct ClientProxyServices { appSettings: AppSettings) async throws { let syncService = try await client .syncService() - .withCrossProcessLock() .withOfflineMode() .withSharePos(enable: true) .finish() diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index b2a57d6be..39a35e8ed 100644 --- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -5142,6 +5142,77 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { } } + //MARK: - subscribeToDuplicateKeyUploadErrors + + open var subscribeToDuplicateKeyUploadErrorsListenerUnderlyingCallsCount = 0 + open var subscribeToDuplicateKeyUploadErrorsListenerCallsCount: Int { + get { + if Thread.isMainThread { + return subscribeToDuplicateKeyUploadErrorsListenerUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = subscribeToDuplicateKeyUploadErrorsListenerUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + subscribeToDuplicateKeyUploadErrorsListenerUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + subscribeToDuplicateKeyUploadErrorsListenerUnderlyingCallsCount = newValue + } + } + } + } + open var subscribeToDuplicateKeyUploadErrorsListenerCalled: Bool { + return subscribeToDuplicateKeyUploadErrorsListenerCallsCount > 0 + } + open var subscribeToDuplicateKeyUploadErrorsListenerReceivedListener: DuplicateKeyUploadErrorListener? + open var subscribeToDuplicateKeyUploadErrorsListenerReceivedInvocations: [DuplicateKeyUploadErrorListener] = [] + + open var subscribeToDuplicateKeyUploadErrorsListenerUnderlyingReturnValue: TaskHandle! + open var subscribeToDuplicateKeyUploadErrorsListenerReturnValue: TaskHandle! { + get { + if Thread.isMainThread { + return subscribeToDuplicateKeyUploadErrorsListenerUnderlyingReturnValue + } else { + var returnValue: TaskHandle? = nil + DispatchQueue.main.sync { + returnValue = subscribeToDuplicateKeyUploadErrorsListenerUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + subscribeToDuplicateKeyUploadErrorsListenerUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + subscribeToDuplicateKeyUploadErrorsListenerUnderlyingReturnValue = newValue + } + } + } + } + open var subscribeToDuplicateKeyUploadErrorsListenerClosure: ((DuplicateKeyUploadErrorListener) -> TaskHandle)? + + open override func subscribeToDuplicateKeyUploadErrors(listener: DuplicateKeyUploadErrorListener) -> TaskHandle { + subscribeToDuplicateKeyUploadErrorsListenerCallsCount += 1 + subscribeToDuplicateKeyUploadErrorsListenerReceivedListener = listener + DispatchQueue.main.async { + self.subscribeToDuplicateKeyUploadErrorsListenerReceivedInvocations.append(listener) + } + if let subscribeToDuplicateKeyUploadErrorsListenerClosure = subscribeToDuplicateKeyUploadErrorsListenerClosure { + return subscribeToDuplicateKeyUploadErrorsListenerClosure(listener) + } else { + return subscribeToDuplicateKeyUploadErrorsListenerReturnValue + } + } + //MARK: - subscribeToIgnoredUsers open var subscribeToIgnoredUsersListenerUnderlyingCallsCount = 0 @@ -6483,17 +6554,17 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } - //MARK: - crossProcessStoreLocksHolderName + //MARK: - crossProcessLockConfig - open var crossProcessStoreLocksHolderNameHolderNameUnderlyingCallsCount = 0 - open var crossProcessStoreLocksHolderNameHolderNameCallsCount: Int { + open var crossProcessLockConfigCrossProcessLockConfigUnderlyingCallsCount = 0 + open var crossProcessLockConfigCrossProcessLockConfigCallsCount: Int { get { if Thread.isMainThread { - return crossProcessStoreLocksHolderNameHolderNameUnderlyingCallsCount + return crossProcessLockConfigCrossProcessLockConfigUnderlyingCallsCount } else { var returnValue: Int? = nil DispatchQueue.main.sync { - returnValue = crossProcessStoreLocksHolderNameHolderNameUnderlyingCallsCount + returnValue = crossProcessLockConfigCrossProcessLockConfigUnderlyingCallsCount } return returnValue! @@ -6501,29 +6572,29 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } set { if Thread.isMainThread { - crossProcessStoreLocksHolderNameHolderNameUnderlyingCallsCount = newValue + crossProcessLockConfigCrossProcessLockConfigUnderlyingCallsCount = newValue } else { DispatchQueue.main.sync { - crossProcessStoreLocksHolderNameHolderNameUnderlyingCallsCount = newValue + crossProcessLockConfigCrossProcessLockConfigUnderlyingCallsCount = newValue } } } } - open var crossProcessStoreLocksHolderNameHolderNameCalled: Bool { - return crossProcessStoreLocksHolderNameHolderNameCallsCount > 0 + open var crossProcessLockConfigCrossProcessLockConfigCalled: Bool { + return crossProcessLockConfigCrossProcessLockConfigCallsCount > 0 } - open var crossProcessStoreLocksHolderNameHolderNameReceivedHolderName: String? - open var crossProcessStoreLocksHolderNameHolderNameReceivedInvocations: [String] = [] + open var crossProcessLockConfigCrossProcessLockConfigReceivedCrossProcessLockConfig: CrossProcessLockConfig? + open var crossProcessLockConfigCrossProcessLockConfigReceivedInvocations: [CrossProcessLockConfig] = [] - open var crossProcessStoreLocksHolderNameHolderNameUnderlyingReturnValue: ClientBuilder! - open var crossProcessStoreLocksHolderNameHolderNameReturnValue: ClientBuilder! { + open var crossProcessLockConfigCrossProcessLockConfigUnderlyingReturnValue: ClientBuilder! + open var crossProcessLockConfigCrossProcessLockConfigReturnValue: ClientBuilder! { get { if Thread.isMainThread { - return crossProcessStoreLocksHolderNameHolderNameUnderlyingReturnValue + return crossProcessLockConfigCrossProcessLockConfigUnderlyingReturnValue } else { var returnValue: ClientBuilder? = nil DispatchQueue.main.sync { - returnValue = crossProcessStoreLocksHolderNameHolderNameUnderlyingReturnValue + returnValue = crossProcessLockConfigCrossProcessLockConfigUnderlyingReturnValue } return returnValue! @@ -6531,26 +6602,26 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } set { if Thread.isMainThread { - crossProcessStoreLocksHolderNameHolderNameUnderlyingReturnValue = newValue + crossProcessLockConfigCrossProcessLockConfigUnderlyingReturnValue = newValue } else { DispatchQueue.main.sync { - crossProcessStoreLocksHolderNameHolderNameUnderlyingReturnValue = newValue + crossProcessLockConfigCrossProcessLockConfigUnderlyingReturnValue = newValue } } } } - open var crossProcessStoreLocksHolderNameHolderNameClosure: ((String) -> ClientBuilder)? + open var crossProcessLockConfigCrossProcessLockConfigClosure: ((CrossProcessLockConfig) -> ClientBuilder)? - open override func crossProcessStoreLocksHolderName(holderName: String) -> ClientBuilder { - crossProcessStoreLocksHolderNameHolderNameCallsCount += 1 - crossProcessStoreLocksHolderNameHolderNameReceivedHolderName = holderName + open override func crossProcessLockConfig(crossProcessLockConfig: CrossProcessLockConfig) -> ClientBuilder { + crossProcessLockConfigCrossProcessLockConfigCallsCount += 1 + crossProcessLockConfigCrossProcessLockConfigReceivedCrossProcessLockConfig = crossProcessLockConfig DispatchQueue.main.async { - self.crossProcessStoreLocksHolderNameHolderNameReceivedInvocations.append(holderName) + self.crossProcessLockConfigCrossProcessLockConfigReceivedInvocations.append(crossProcessLockConfig) } - if let crossProcessStoreLocksHolderNameHolderNameClosure = crossProcessStoreLocksHolderNameHolderNameClosure { - return crossProcessStoreLocksHolderNameHolderNameClosure(holderName) + if let crossProcessLockConfigCrossProcessLockConfigClosure = crossProcessLockConfigCrossProcessLockConfigClosure { + return crossProcessLockConfigCrossProcessLockConfigClosure(crossProcessLockConfig) } else { - return crossProcessStoreLocksHolderNameHolderNameReturnValue + return crossProcessLockConfigCrossProcessLockConfigReturnValue } } @@ -25138,71 +25209,6 @@ open class SyncServiceBuilderSDKMock: MatrixRustSDK.SyncServiceBuilder, @uncheck } } - //MARK: - withCrossProcessLock - - open var withCrossProcessLockUnderlyingCallsCount = 0 - open var withCrossProcessLockCallsCount: Int { - get { - if Thread.isMainThread { - return withCrossProcessLockUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = withCrossProcessLockUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - withCrossProcessLockUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - withCrossProcessLockUnderlyingCallsCount = newValue - } - } - } - } - open var withCrossProcessLockCalled: Bool { - return withCrossProcessLockCallsCount > 0 - } - - open var withCrossProcessLockUnderlyingReturnValue: SyncServiceBuilder! - open var withCrossProcessLockReturnValue: SyncServiceBuilder! { - get { - if Thread.isMainThread { - return withCrossProcessLockUnderlyingReturnValue - } else { - var returnValue: SyncServiceBuilder? = nil - DispatchQueue.main.sync { - returnValue = withCrossProcessLockUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - withCrossProcessLockUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - withCrossProcessLockUnderlyingReturnValue = newValue - } - } - } - } - open var withCrossProcessLockClosure: (() -> SyncServiceBuilder)? - - open override func withCrossProcessLock() -> SyncServiceBuilder { - withCrossProcessLockCallsCount += 1 - if let withCrossProcessLockClosure = withCrossProcessLockClosure { - return withCrossProcessLockClosure() - } else { - return withCrossProcessLockReturnValue - } - } - //MARK: - withOfflineMode open var withOfflineModeUnderlyingCallsCount = 0 diff --git a/project.yml b/project.yml index b27b98682..2f1448162 100644 --- a/project.yml +++ b/project.yml @@ -73,7 +73,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 26.02.13 + exactVersion: 26.02.24 # path: ../matrix-rust-sdk Compound: path: compound-ios