diff --git a/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index 129779d0c..161fa1f7d 100644 --- a/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -2406,6 +2406,53 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { } } + //MARK: - notificationClientWithTimeouts + + open var notificationClientWithTimeoutsProcessSetupTimeoutsThrowableError: Error? + private let notificationClientWithTimeoutsProcessSetupTimeoutsCallsCountLock = NSLock() + private var notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingCallsCount = 0 + open var notificationClientWithTimeoutsProcessSetupTimeoutsCallsCount: Int { + get { notificationClientWithTimeoutsProcessSetupTimeoutsCallsCountLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingCallsCount } } + set { notificationClientWithTimeoutsProcessSetupTimeoutsCallsCountLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingCallsCount = newValue } } + } + open var notificationClientWithTimeoutsProcessSetupTimeoutsCalled: Bool { + return notificationClientWithTimeoutsProcessSetupTimeoutsCallsCount > 0 + } + private let notificationClientWithTimeoutsProcessSetupTimeoutsReceivedArgumentsLock = NSLock() + private var notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedArguments: (processSetup: NotificationProcessSetup, timeouts: NotificationClientTimeouts)? + open var notificationClientWithTimeoutsProcessSetupTimeoutsReceivedArguments: (processSetup: NotificationProcessSetup, timeouts: NotificationClientTimeouts)? { + get { notificationClientWithTimeoutsProcessSetupTimeoutsReceivedArgumentsLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedArguments } } + set { notificationClientWithTimeoutsProcessSetupTimeoutsReceivedArgumentsLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedArguments = newValue } } + } + private let notificationClientWithTimeoutsProcessSetupTimeoutsReceivedInvocationsLock = NSLock() + private var notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedInvocations: [(processSetup: NotificationProcessSetup, timeouts: NotificationClientTimeouts)] = [] + open var notificationClientWithTimeoutsProcessSetupTimeoutsReceivedInvocations: [(processSetup: NotificationProcessSetup, timeouts: NotificationClientTimeouts)] { + get { notificationClientWithTimeoutsProcessSetupTimeoutsReceivedInvocationsLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedInvocations } } + set { notificationClientWithTimeoutsProcessSetupTimeoutsReceivedInvocationsLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedInvocations = newValue } } + } + + private let notificationClientWithTimeoutsProcessSetupTimeoutsReturnValueLock = NSLock() + open var notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReturnValue: NotificationClient! + open var notificationClientWithTimeoutsProcessSetupTimeoutsReturnValue: NotificationClient! { + get { notificationClientWithTimeoutsProcessSetupTimeoutsReturnValueLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReturnValue } } + set { notificationClientWithTimeoutsProcessSetupTimeoutsReturnValueLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReturnValue = newValue } } + } + open var notificationClientWithTimeoutsProcessSetupTimeoutsClosure: ((NotificationProcessSetup, NotificationClientTimeouts) async throws -> NotificationClient)? + + open override func notificationClientWithTimeouts(processSetup: NotificationProcessSetup, timeouts: NotificationClientTimeouts) async throws -> NotificationClient { + if let error = notificationClientWithTimeoutsProcessSetupTimeoutsThrowableError { + throw error + } + notificationClientWithTimeoutsProcessSetupTimeoutsCallsCountLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingCallsCount += 1 } + notificationClientWithTimeoutsProcessSetupTimeoutsReceivedArguments = (processSetup: processSetup, timeouts: timeouts) + notificationClientWithTimeoutsProcessSetupTimeoutsReceivedInvocationsLock.withLock { notificationClientWithTimeoutsProcessSetupTimeoutsUnderlyingReceivedInvocations.append((processSetup: processSetup, timeouts: timeouts)) } + if let notificationClientWithTimeoutsProcessSetupTimeoutsClosure = notificationClientWithTimeoutsProcessSetupTimeoutsClosure { + return try await notificationClientWithTimeoutsProcessSetupTimeoutsClosure(processSetup, timeouts) + } else { + return notificationClientWithTimeoutsProcessSetupTimeoutsReturnValue + } + } + //MARK: - observeAccountDataEvent private let observeAccountDataEventEventTypeListenerCallsCountLock = NSLock() @@ -2964,6 +3011,53 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { } } + //MARK: - sendEncryptedToDeviceMessage + + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentThrowableError: Error? + private let sendEncryptedToDeviceMessageEventTypeRecipientsContentCallsCountLock = NSLock() + private var sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingCallsCount = 0 + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentCallsCount: Int { + get { sendEncryptedToDeviceMessageEventTypeRecipientsContentCallsCountLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingCallsCount } } + set { sendEncryptedToDeviceMessageEventTypeRecipientsContentCallsCountLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingCallsCount = newValue } } + } + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentCalled: Bool { + return sendEncryptedToDeviceMessageEventTypeRecipientsContentCallsCount > 0 + } + private let sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedArgumentsLock = NSLock() + private var sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedArguments: (eventType: String, recipients: [String: [String]], content: String)? + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedArguments: (eventType: String, recipients: [String: [String]], content: String)? { + get { sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedArgumentsLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedArguments } } + set { sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedArgumentsLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedArguments = newValue } } + } + private let sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedInvocationsLock = NSLock() + private var sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedInvocations: [(eventType: String, recipients: [String: [String]], content: String)] = [] + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedInvocations: [(eventType: String, recipients: [String: [String]], content: String)] { + get { sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedInvocationsLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedInvocations } } + set { sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedInvocationsLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedInvocations = newValue } } + } + + private let sendEncryptedToDeviceMessageEventTypeRecipientsContentReturnValueLock = NSLock() + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReturnValue: SendToDeviceOutcome! + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentReturnValue: SendToDeviceOutcome! { + get { sendEncryptedToDeviceMessageEventTypeRecipientsContentReturnValueLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReturnValue } } + set { sendEncryptedToDeviceMessageEventTypeRecipientsContentReturnValueLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReturnValue = newValue } } + } + open var sendEncryptedToDeviceMessageEventTypeRecipientsContentClosure: ((String, [String: [String]], String) async throws -> SendToDeviceOutcome)? + + open override func sendEncryptedToDeviceMessage(eventType: String, recipients: [String: [String]], content: String) async throws -> SendToDeviceOutcome { + if let error = sendEncryptedToDeviceMessageEventTypeRecipientsContentThrowableError { + throw error + } + sendEncryptedToDeviceMessageEventTypeRecipientsContentCallsCountLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingCallsCount += 1 } + sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedArguments = (eventType: eventType, recipients: recipients, content: content) + sendEncryptedToDeviceMessageEventTypeRecipientsContentReceivedInvocationsLock.withLock { sendEncryptedToDeviceMessageEventTypeRecipientsContentUnderlyingReceivedInvocations.append((eventType: eventType, recipients: recipients, content: content)) } + if let sendEncryptedToDeviceMessageEventTypeRecipientsContentClosure = sendEncryptedToDeviceMessageEventTypeRecipientsContentClosure { + return try await sendEncryptedToDeviceMessageEventTypeRecipientsContentClosure(eventType, recipients, content) + } else { + return sendEncryptedToDeviceMessageEventTypeRecipientsContentReturnValue + } + } + //MARK: - server private let serverCallsCountLock = NSLock() @@ -8489,6 +8583,35 @@ open class NotificationClientSDKMock: MatrixRustSDK.NotificationClient, @uncheck return getRoomRoomIdReturnValue } } + + //MARK: - timeouts + + private let timeoutsCallsCountLock = NSLock() + private var timeoutsUnderlyingCallsCount = 0 + open var timeoutsCallsCount: Int { + get { timeoutsCallsCountLock.withLock { timeoutsUnderlyingCallsCount } } + set { timeoutsCallsCountLock.withLock { timeoutsUnderlyingCallsCount = newValue } } + } + open var timeoutsCalled: Bool { + return timeoutsCallsCount > 0 + } + + private let timeoutsReturnValueLock = NSLock() + open var timeoutsUnderlyingReturnValue: NotificationClientTimeouts! + open var timeoutsReturnValue: NotificationClientTimeouts! { + get { timeoutsReturnValueLock.withLock { timeoutsUnderlyingReturnValue } } + set { timeoutsReturnValueLock.withLock { timeoutsUnderlyingReturnValue = newValue } } + } + open var timeoutsClosure: (() -> NotificationClientTimeouts)? + + open override func timeouts() -> NotificationClientTimeouts { + timeoutsCallsCountLock.withLock { timeoutsUnderlyingCallsCount += 1 } + if let timeoutsClosure = timeoutsClosure { + return timeoutsClosure() + } else { + return timeoutsReturnValue + } + } } open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unchecked Sendable { public init() { @@ -16318,6 +16441,53 @@ open class SpaceServiceSDKMock: MatrixRustSDK.SpaceService, @unchecked Sendable } } + //MARK: - joinedParentIdsOfChild + + open var joinedParentIdsOfChildChildIdThrowableError: Error? + private let joinedParentIdsOfChildChildIdCallsCountLock = NSLock() + private var joinedParentIdsOfChildChildIdUnderlyingCallsCount = 0 + open var joinedParentIdsOfChildChildIdCallsCount: Int { + get { joinedParentIdsOfChildChildIdCallsCountLock.withLock { joinedParentIdsOfChildChildIdUnderlyingCallsCount } } + set { joinedParentIdsOfChildChildIdCallsCountLock.withLock { joinedParentIdsOfChildChildIdUnderlyingCallsCount = newValue } } + } + open var joinedParentIdsOfChildChildIdCalled: Bool { + return joinedParentIdsOfChildChildIdCallsCount > 0 + } + private let joinedParentIdsOfChildChildIdReceivedChildIdLock = NSLock() + private var joinedParentIdsOfChildChildIdUnderlyingReceivedChildId: String? + open var joinedParentIdsOfChildChildIdReceivedChildId: String? { + get { joinedParentIdsOfChildChildIdReceivedChildIdLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReceivedChildId } } + set { joinedParentIdsOfChildChildIdReceivedChildIdLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReceivedChildId = newValue } } + } + private let joinedParentIdsOfChildChildIdReceivedInvocationsLock = NSLock() + private var joinedParentIdsOfChildChildIdUnderlyingReceivedInvocations: [String] = [] + open var joinedParentIdsOfChildChildIdReceivedInvocations: [String] { + get { joinedParentIdsOfChildChildIdReceivedInvocationsLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReceivedInvocations } } + set { joinedParentIdsOfChildChildIdReceivedInvocationsLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReceivedInvocations = newValue } } + } + + private let joinedParentIdsOfChildChildIdReturnValueLock = NSLock() + open var joinedParentIdsOfChildChildIdUnderlyingReturnValue: [String]! + open var joinedParentIdsOfChildChildIdReturnValue: [String]! { + get { joinedParentIdsOfChildChildIdReturnValueLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReturnValue } } + set { joinedParentIdsOfChildChildIdReturnValueLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReturnValue = newValue } } + } + open var joinedParentIdsOfChildChildIdClosure: ((String) async throws -> [String])? + + open override func joinedParentIdsOfChild(childId: String) async throws -> [String] { + if let error = joinedParentIdsOfChildChildIdThrowableError { + throw error + } + joinedParentIdsOfChildChildIdCallsCountLock.withLock { joinedParentIdsOfChildChildIdUnderlyingCallsCount += 1 } + joinedParentIdsOfChildChildIdReceivedChildId = childId + joinedParentIdsOfChildChildIdReceivedInvocationsLock.withLock { joinedParentIdsOfChildChildIdUnderlyingReceivedInvocations.append(childId) } + if let joinedParentIdsOfChildChildIdClosure = joinedParentIdsOfChildChildIdClosure { + return try await joinedParentIdsOfChildChildIdClosure(childId) + } else { + return joinedParentIdsOfChildChildIdReturnValue + } + } + //MARK: - joinedParentsOfChild open var joinedParentsOfChildChildIdThrowableError: Error? @@ -16610,6 +16780,53 @@ open class SpaceServiceSDKMock: MatrixRustSDK.SpaceService, @unchecked Sendable } } + //MARK: - topLevelAncestorsOf + + open var topLevelAncestorsOfChildIdThrowableError: Error? + private let topLevelAncestorsOfChildIdCallsCountLock = NSLock() + private var topLevelAncestorsOfChildIdUnderlyingCallsCount = 0 + open var topLevelAncestorsOfChildIdCallsCount: Int { + get { topLevelAncestorsOfChildIdCallsCountLock.withLock { topLevelAncestorsOfChildIdUnderlyingCallsCount } } + set { topLevelAncestorsOfChildIdCallsCountLock.withLock { topLevelAncestorsOfChildIdUnderlyingCallsCount = newValue } } + } + open var topLevelAncestorsOfChildIdCalled: Bool { + return topLevelAncestorsOfChildIdCallsCount > 0 + } + private let topLevelAncestorsOfChildIdReceivedChildIdLock = NSLock() + private var topLevelAncestorsOfChildIdUnderlyingReceivedChildId: String? + open var topLevelAncestorsOfChildIdReceivedChildId: String? { + get { topLevelAncestorsOfChildIdReceivedChildIdLock.withLock { topLevelAncestorsOfChildIdUnderlyingReceivedChildId } } + set { topLevelAncestorsOfChildIdReceivedChildIdLock.withLock { topLevelAncestorsOfChildIdUnderlyingReceivedChildId = newValue } } + } + private let topLevelAncestorsOfChildIdReceivedInvocationsLock = NSLock() + private var topLevelAncestorsOfChildIdUnderlyingReceivedInvocations: [String] = [] + open var topLevelAncestorsOfChildIdReceivedInvocations: [String] { + get { topLevelAncestorsOfChildIdReceivedInvocationsLock.withLock { topLevelAncestorsOfChildIdUnderlyingReceivedInvocations } } + set { topLevelAncestorsOfChildIdReceivedInvocationsLock.withLock { topLevelAncestorsOfChildIdUnderlyingReceivedInvocations = newValue } } + } + + private let topLevelAncestorsOfChildIdReturnValueLock = NSLock() + open var topLevelAncestorsOfChildIdUnderlyingReturnValue: [String]! + open var topLevelAncestorsOfChildIdReturnValue: [String]! { + get { topLevelAncestorsOfChildIdReturnValueLock.withLock { topLevelAncestorsOfChildIdUnderlyingReturnValue } } + set { topLevelAncestorsOfChildIdReturnValueLock.withLock { topLevelAncestorsOfChildIdUnderlyingReturnValue = newValue } } + } + open var topLevelAncestorsOfChildIdClosure: ((String) async throws -> [String])? + + open override func topLevelAncestorsOf(childId: String) async throws -> [String] { + if let error = topLevelAncestorsOfChildIdThrowableError { + throw error + } + topLevelAncestorsOfChildIdCallsCountLock.withLock { topLevelAncestorsOfChildIdUnderlyingCallsCount += 1 } + topLevelAncestorsOfChildIdReceivedChildId = childId + topLevelAncestorsOfChildIdReceivedInvocationsLock.withLock { topLevelAncestorsOfChildIdUnderlyingReceivedInvocations.append(childId) } + if let topLevelAncestorsOfChildIdClosure = topLevelAncestorsOfChildIdClosure { + return try await topLevelAncestorsOfChildIdClosure(childId) + } else { + return topLevelAncestorsOfChildIdReturnValue + } + } + //MARK: - topLevelJoinedSpaces private let topLevelJoinedSpacesCallsCountLock = NSLock() @@ -16780,6 +16997,49 @@ open class SqliteStoreBuilderSDKMock: MatrixRustSDK.SqliteStoreBuilder, @uncheck } } + //MARK: - highEntropyPassphrase + + private let highEntropyPassphrasePassphraseBase64VariantCallsCountLock = NSLock() + private var highEntropyPassphrasePassphraseBase64VariantUnderlyingCallsCount = 0 + open var highEntropyPassphrasePassphraseBase64VariantCallsCount: Int { + get { highEntropyPassphrasePassphraseBase64VariantCallsCountLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingCallsCount } } + set { highEntropyPassphrasePassphraseBase64VariantCallsCountLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingCallsCount = newValue } } + } + open var highEntropyPassphrasePassphraseBase64VariantCalled: Bool { + return highEntropyPassphrasePassphraseBase64VariantCallsCount > 0 + } + private let highEntropyPassphrasePassphraseBase64VariantReceivedArgumentsLock = NSLock() + private var highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedArguments: (passphrase: Data?, base64Variant: Base64Variant)? + open var highEntropyPassphrasePassphraseBase64VariantReceivedArguments: (passphrase: Data?, base64Variant: Base64Variant)? { + get { highEntropyPassphrasePassphraseBase64VariantReceivedArgumentsLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedArguments } } + set { highEntropyPassphrasePassphraseBase64VariantReceivedArgumentsLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedArguments = newValue } } + } + private let highEntropyPassphrasePassphraseBase64VariantReceivedInvocationsLock = NSLock() + private var highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedInvocations: [(passphrase: Data?, base64Variant: Base64Variant)] = [] + open var highEntropyPassphrasePassphraseBase64VariantReceivedInvocations: [(passphrase: Data?, base64Variant: Base64Variant)] { + get { highEntropyPassphrasePassphraseBase64VariantReceivedInvocationsLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedInvocations } } + set { highEntropyPassphrasePassphraseBase64VariantReceivedInvocationsLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedInvocations = newValue } } + } + + private let highEntropyPassphrasePassphraseBase64VariantReturnValueLock = NSLock() + open var highEntropyPassphrasePassphraseBase64VariantUnderlyingReturnValue: SqliteStoreBuilder! + open var highEntropyPassphrasePassphraseBase64VariantReturnValue: SqliteStoreBuilder! { + get { highEntropyPassphrasePassphraseBase64VariantReturnValueLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReturnValue } } + set { highEntropyPassphrasePassphraseBase64VariantReturnValueLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReturnValue = newValue } } + } + open var highEntropyPassphrasePassphraseBase64VariantClosure: ((Data?, Base64Variant) -> SqliteStoreBuilder)? + + open override func highEntropyPassphrase(passphrase: Data?, base64Variant: Base64Variant) -> SqliteStoreBuilder { + highEntropyPassphrasePassphraseBase64VariantCallsCountLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingCallsCount += 1 } + highEntropyPassphrasePassphraseBase64VariantReceivedArguments = (passphrase: passphrase, base64Variant: base64Variant) + highEntropyPassphrasePassphraseBase64VariantReceivedInvocationsLock.withLock { highEntropyPassphrasePassphraseBase64VariantUnderlyingReceivedInvocations.append((passphrase: passphrase, base64Variant: base64Variant)) } + if let highEntropyPassphrasePassphraseBase64VariantClosure = highEntropyPassphrasePassphraseBase64VariantClosure { + return highEntropyPassphrasePassphraseBase64VariantClosure(passphrase, base64Variant) + } else { + return highEntropyPassphrasePassphraseBase64VariantReturnValue + } + } + //MARK: - journalSizeLimit private let journalSizeLimitLimitCallsCountLock = NSLock() @@ -19875,14 +20135,14 @@ open class WidgetDriverHandleSDKMock: MatrixRustSDK.WidgetDriverHandle, @uncheck get { sendMsgReturnValueLock.withLock { sendMsgUnderlyingReturnValue } } set { sendMsgReturnValueLock.withLock { sendMsgUnderlyingReturnValue = newValue } } } - open var sendMsgClosure: ((String) async -> Bool)? + open var sendMsgClosure: ((String) -> Bool)? - open override func send(msg: String) async -> Bool { + open override func send(msg: String) -> Bool { sendMsgCallsCountLock.withLock { sendMsgUnderlyingCallsCount += 1 } sendMsgReceivedMsg = msg sendMsgReceivedInvocationsLock.withLock { sendMsgUnderlyingReceivedInvocations.append(msg) } if let sendMsgClosure = sendMsgClosure { - return await sendMsgClosure(msg) + return sendMsgClosure(msg) } else { return sendMsgReturnValue } diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 009ff1b23..506023655 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -10853,7 +10853,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.09.09; + version = 26.09.17; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8d24780cd..7ed795a52 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "f1791683f9f09408a7746ce0e163941b3ce7e83e84f1a73b2fecc2b5d2f2f4b6", + "originHash" : "b74cb643b63fefdb973bc88e670a30441195770c21a88cceea0f42789cdb8f51", "pins" : [ { "identity" : "compound-design-tokens", @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "56ec8d0458a688018bbd9f1f2fd70fae7919f415", - "version" : "26.9.9" + "revision" : "7605a7b64a7a3219a82c36a95f37b79b6de204ca", + "version" : "26.9.17" } }, { diff --git a/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift b/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift index d91a159b4..1fe146c19 100644 --- a/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift +++ b/ElementX/Sources/Mocks/SDK/EventTimelineItem.swift @@ -21,7 +21,6 @@ nonisolated struct EventTimelineItemSDKMockConfiguration { var isEditable = false var canBeRepliedTo = false var content: TimelineItemContent = .msgLike(content: .init(kind: .redacted, - reactions: [], inReplyTo: nil, threadRoot: nil, threadSummary: nil)) @@ -42,6 +41,7 @@ nonisolated extension EventTimelineItem { isOwn: configuration.isOwn, isEditable: configuration.isEditable, content: configuration.content, + reactions: [], eventTypeRaw: nil, timestamp: UInt64(Date.mock.timeIntervalSince1970 * 1000), localSendState: nil, @@ -60,7 +60,6 @@ nonisolated extension EventTimelineItem { body: body, isEdited: false, mentions: nil)), - reactions: [], inReplyTo: nil, threadRoot: nil, threadSummary: nil)) diff --git a/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift b/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift index 1c8fcb4f4..deb6d5e7f 100644 --- a/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift +++ b/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift @@ -167,7 +167,7 @@ final class ElementCallWidgetDriver: WidgetCapabilitiesProvider, ElementCallWidg return .failure(.driverNotSetup) } - let result = await widgetDriver.handle.send(msg: message) + let result = widgetDriver.handle.send(msg: message) MXLog.debug("Sent message: \(message) with result: \(result)") handleMessageIfNeeded(message) diff --git a/ElementX/Sources/Services/Timeline/Fixtures/TimelineFixtures.swift b/ElementX/Sources/Services/Timeline/Fixtures/TimelineFixtures.swift index c091efcdb..a356647b6 100644 --- a/ElementX/Sources/Services/Timeline/Fixtures/TimelineFixtures.swift +++ b/ElementX/Sources/Services/Timeline/Fixtures/TimelineFixtures.swift @@ -264,7 +264,6 @@ extension TimelineItemProxy { body: body, isEdited: isEdited, mentions: nil)), - reactions: [], inReplyTo: nil, threadRoot: nil, threadSummary: nil)) @@ -289,7 +288,6 @@ private extension TimelineItemProxy { body: body, isEdited: false, mentions: nil)), - reactions: [], inReplyTo: nil, threadRoot: nil, threadSummary: nil)) diff --git a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift index 69a744b44..93071f123 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift @@ -158,6 +158,10 @@ final nonisolated class EventTimelineItemProxy: Sendable { var readReceipts: [String: Receipt] { item.readReceipts } + + var reactions: [Reaction] { + item.reactions + } } nonisolated struct TimelineItemDebugInfo: Identifiable, CustomStringConvertible { diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift index cc6492ae4..6cc60ce46 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift @@ -210,7 +210,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -234,7 +234,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -258,7 +258,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -282,7 +282,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -305,7 +305,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -329,7 +329,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -352,7 +352,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -375,7 +375,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -398,7 +398,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -422,7 +422,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: messageContent.isEdited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -480,7 +480,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { properties: .init(replyDetails: buildTimelineItemReplyDetails(messageLikeContent.inReplyTo), isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -541,7 +541,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), isEdited: edited, - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), @@ -562,7 +562,7 @@ nonisolated struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { properties: .init(replyDetails: buildTimelineItemReplyDetails(messageLikeContent.inReplyTo), isThreaded: messageLikeContent.threadRoot != nil, threadSummary: buildTimelineItemThreadSummary(messageLikeContent.threadSummary), - reactions: buildAggregatedReactions(messageLikeContent.reactions), + reactions: buildAggregatedReactions(eventItemProxy.reactions), deliveryStatus: eventItemProxy.deliveryStatus, orderedReadReceipts: buildOrderedReadReceipts(eventItemProxy.readReceipts), encryptionAuthenticity: buildEncryptionAuthenticity(eventItemProxy.shieldState), diff --git a/UnitTests/Sources/RoomEventStringBuilderTests.swift b/UnitTests/Sources/RoomEventStringBuilderTests.swift index 52b78f1a1..e1189ec24 100644 --- a/UnitTests/Sources/RoomEventStringBuilderTests.swift +++ b/UnitTests/Sources/RoomEventStringBuilderTests.swift @@ -84,7 +84,6 @@ struct RoomEventStringBuilderTests { body: message, isEdited: false, mentions: nil)), - reactions: [], inReplyTo: nil, threadRoot: nil, threadSummary: nil)))), @@ -118,7 +117,6 @@ struct RoomEventStringBuilderTests { votes: [:], endTime: nil, hasBeenEdited: false), - reactions: [], inReplyTo: nil, threadRoot: nil, threadSummary: nil)))), diff --git a/project.yml b/project.yml index c30d06858..e039e0974 100644 --- a/project.yml +++ b/project.yml @@ -74,7 +74,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 26.09.09 + exactVersion: 26.09.17 # path: ../matrix-rust-sdk Compound: path: compound-ios