diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 196284c62..f63f6aef0 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -7629,7 +7629,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 1.0.37; + version = 1.0.38; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 23313ec4c..3389a2ac8 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -149,8 +149,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "708e5db177654344956d503677dfef058f546a47", - "version" : "1.0.37" + "revision" : "931704646891b7e74e69da9c90fc21382ef82dcd", + "version" : "1.0.38" } }, { diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift index 07464daaa..16157ee58 100644 --- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift +++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift @@ -7811,6 +7811,42 @@ open class IdentityResetHandleSDKMock: MatrixRustSDK.IdentityResetHandle { } } + //MARK: - cancel + + var cancelUnderlyingCallsCount = 0 + open var cancelCallsCount: Int { + get { + if Thread.isMainThread { + return cancelUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = cancelUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + cancelUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + cancelUnderlyingCallsCount = newValue + } + } + } + } + open var cancelCalled: Bool { + return cancelCallsCount > 0 + } + open var cancelClosure: (() async -> Void)? + + open override func cancel() async { + cancelCallsCount += 1 + await cancelClosure?() + } + //MARK: - reset open var resetAuthThrowableError: Error? @@ -9827,82 +9863,6 @@ open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings { try await unmuteRoomRoomIdIsEncryptedIsOneToOneClosure?(roomId, isEncrypted, isOneToOne) } } -open class OidcAuthorizationDataSDKMock: MatrixRustSDK.OidcAuthorizationData { - init() { - super.init(noPointer: .init()) - } - - public required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) { - fatalError("init(unsafeFromRawPointer:) has not been implemented") - } - - fileprivate var pointer: UnsafeMutableRawPointer! - - //MARK: - loginUrl - - var loginUrlUnderlyingCallsCount = 0 - open var loginUrlCallsCount: Int { - get { - if Thread.isMainThread { - return loginUrlUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = loginUrlUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - loginUrlUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - loginUrlUnderlyingCallsCount = newValue - } - } - } - } - open var loginUrlCalled: Bool { - return loginUrlCallsCount > 0 - } - - var loginUrlUnderlyingReturnValue: String! - open var loginUrlReturnValue: String! { - get { - if Thread.isMainThread { - return loginUrlUnderlyingReturnValue - } else { - var returnValue: String? = nil - DispatchQueue.main.sync { - returnValue = loginUrlUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - loginUrlUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - loginUrlUnderlyingReturnValue = newValue - } - } - } - } - open var loginUrlClosure: (() -> String)? - - open override func loginUrl() -> String { - loginUrlCallsCount += 1 - if let loginUrlClosure = loginUrlClosure { - return loginUrlClosure() - } else { - return loginUrlReturnValue - } - } -} open class QrCodeDataSDKMock: MatrixRustSDK.QrCodeData { init() { super.init(noPointer: .init()) @@ -11060,42 +11020,6 @@ open class RoomSDKMock: MatrixRustSDK.Room { try await clearComposerDraftClosure?() } - //MARK: - clearPinnedEventsCache - - var clearPinnedEventsCacheUnderlyingCallsCount = 0 - open var clearPinnedEventsCacheCallsCount: Int { - get { - if Thread.isMainThread { - return clearPinnedEventsCacheUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = clearPinnedEventsCacheUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - clearPinnedEventsCacheUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - clearPinnedEventsCacheUnderlyingCallsCount = newValue - } - } - } - } - open var clearPinnedEventsCacheCalled: Bool { - return clearPinnedEventsCacheCallsCount > 0 - } - open var clearPinnedEventsCacheClosure: (() async -> Void)? - - open override func clearPinnedEventsCache() async { - clearPinnedEventsCacheCallsCount += 1 - await clearPinnedEventsCacheClosure?() - } - //MARK: - discardRoomKey open var discardRoomKeyThrowableError: Error? @@ -16366,6 +16290,25 @@ open class RoomListServiceSDKMock: MatrixRustSDK.RoomListService { } } } + open var subscribeToRoomsRoomIdsSettingsCalled: Bool { + return subscribeToRoomsRoomIdsSettingsCallsCount > 0 + } + open var subscribeToRoomsRoomIdsSettingsReceivedArguments: (roomIds: [String], settings: RoomSubscription?)? + open var subscribeToRoomsRoomIdsSettingsReceivedInvocations: [(roomIds: [String], settings: RoomSubscription?)] = [] + open var subscribeToRoomsRoomIdsSettingsClosure: (([String], RoomSubscription?) throws -> Void)? + + open override func subscribeToRooms(roomIds: [String], settings: RoomSubscription?) throws { + if let error = subscribeToRoomsRoomIdsSettingsThrowableError { + throw error + } + subscribeToRoomsRoomIdsSettingsCallsCount += 1 + subscribeToRoomsRoomIdsSettingsReceivedArguments = (roomIds: roomIds, settings: settings) + DispatchQueue.main.async { + self.subscribeToRoomsRoomIdsSettingsReceivedInvocations.append((roomIds: roomIds, settings: settings)) + } + try subscribeToRoomsRoomIdsSettingsClosure?(roomIds, settings) + } + //MARK: - syncIndicator var syncIndicatorDelayBeforeShowingInMsDelayBeforeHidingInMsListenerUnderlyingCallsCount = 0 diff --git a/project.yml b/project.yml index f92f304bd..96648565d 100644 --- a/project.yml +++ b/project.yml @@ -60,7 +60,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 1.0.37 + exactVersion: 1.0.38 # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios