diff --git a/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index ae83dc917..307681b2c 100644 --- a/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/Components/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -17293,35 +17293,6 @@ open class SyncServiceBuilderSDKMock: MatrixRustSDK.SyncServiceBuilder, @uncheck } } - //MARK: - withProfilesExtension - - private let withProfilesExtensionCallsCountLock = NSLock() - private var withProfilesExtensionUnderlyingCallsCount = 0 - open var withProfilesExtensionCallsCount: Int { - get { withProfilesExtensionCallsCountLock.withLock { withProfilesExtensionUnderlyingCallsCount } } - set { withProfilesExtensionCallsCountLock.withLock { withProfilesExtensionUnderlyingCallsCount = newValue } } - } - open var withProfilesExtensionCalled: Bool { - return withProfilesExtensionCallsCount > 0 - } - - private let withProfilesExtensionReturnValueLock = NSLock() - open var withProfilesExtensionUnderlyingReturnValue: SyncServiceBuilder! - open var withProfilesExtensionReturnValue: SyncServiceBuilder! { - get { withProfilesExtensionReturnValueLock.withLock { withProfilesExtensionUnderlyingReturnValue } } - set { withProfilesExtensionReturnValueLock.withLock { withProfilesExtensionUnderlyingReturnValue = newValue } } - } - open var withProfilesExtensionClosure: (() -> SyncServiceBuilder)? - - open override func withProfilesExtension() -> SyncServiceBuilder { - withProfilesExtensionCallsCountLock.withLock { withProfilesExtensionUnderlyingCallsCount += 1 } - if let withProfilesExtensionClosure = withProfilesExtensionClosure { - return withProfilesExtensionClosure() - } else { - return withProfilesExtensionReturnValue - } - } - //MARK: - withRoomListConnectionId private let withRoomListConnectionIdConnectionIdCallsCountLock = NSLock() @@ -19346,24 +19317,6 @@ open class TimelineEventSDKMock: MatrixRustSDK.TimelineEvent, @unchecked Sendabl } } } -open class TimelineEventFilterSDKMock: MatrixRustSDK.TimelineEventFilter, @unchecked Sendable { - public init() { - super.init(noHandle: .init()) - } - - public required init(unsafeFromHandle handle: UInt64) { - fatalError("init(unsafeFromHandle:) has not been implemented") - } - - fileprivate var handle: UInt64 { - get { return underlyingHandle } - set(value) { underlyingHandle = value } - } - fileprivate var underlyingHandle: UInt64! - static func reset() - { - } -} open class TimelineItemSDKMock: MatrixRustSDK.TimelineItem, @unchecked Sendable { public init() { super.init(noHandle: .init()) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 6758c55b9..15b1de68f 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -10817,7 +10817,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.09.07; + version = 26.09.08; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 64f6e82d5..1bcb9cc08 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "63650c1515ae2de7e4e00a75e7d01a8dc3c687696663f78bb9d3902cab711634", + "originHash" : "792b23b07d60beec539354df3338b50d91cb38b47c8d2d9b3552f161843e0682", "pins" : [ { "identity" : "compound-design-tokens", @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "22e6fda8817d8fcf6fc30393ee153befa1c84745", - "version" : "26.9.7" + "revision" : "bd4fe022902bb3c3cbeb017cbf60516b6ef7f6f0", + "version" : "26.9.8" } }, { diff --git a/ElementX/Sources/Mocks/SDK/SyncServiceBuilderSDKMock.swift b/ElementX/Sources/Mocks/SDK/SyncServiceBuilderSDKMock.swift index 9be28e973..8bfd67bbd 100644 --- a/ElementX/Sources/Mocks/SDK/SyncServiceBuilderSDKMock.swift +++ b/ElementX/Sources/Mocks/SDK/SyncServiceBuilderSDKMock.swift @@ -19,7 +19,6 @@ nonisolated extension SyncServiceBuilderSDKMock { withOfflineModeClosure = { [unowned self] in self } withSharePosEnableClosure = { [unowned self] _ in self } - withProfilesExtensionClosure = { [unowned self] in self } finishReturnValue = configuration.syncService } } diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift index 0a33d1401..27d54cc5a 100644 --- a/ElementX/Sources/Services/Client/ClientProxy.swift +++ b/ElementX/Sources/Services/Client/ClientProxy.swift @@ -1527,7 +1527,6 @@ private struct ClientProxyServices { .syncService() .withOfflineMode() .withSharePos(enable: true) - .withProfilesExtension() .finish() let roomListService = syncService.roomListService() diff --git a/ElementX/Sources/Services/Room/JoinedRoomProxy.swift b/ElementX/Sources/Services/Room/JoinedRoomProxy.swift index 60de9d80a..17c71f21a 100644 --- a/ElementX/Sources/Services/Room/JoinedRoomProxy.swift +++ b/ElementX/Sources/Services/Room/JoinedRoomProxy.swift @@ -795,19 +795,19 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol { } private static let excludedEventsFilter: TimelineEventFilter = { - var stateEventFilters: [StateEventType] = [.roomCanonicalAlias, - .roomGuestAccess, - .roomHistoryVisibility, - .roomJoinRules, - .roomPinnedEvents, - .roomPowerLevels, - .roomServerAcl, - .roomTombstone, - .spaceChild, - .spaceParent, - .policyRuleRoom, - .policyRuleServer, - .policyRuleUser] - return .excludeEventTypes(eventTypes: stateEventFilters.map { FilterTimelineEventType.state(eventType: $0) }) + var stateEventFilters: [TimelineEventType] = [.roomCanonicalAlias, + .roomGuestAccess, + .roomHistoryVisibility, + .roomJoinRules, + .roomPinnedEvents, + .roomPowerLevels, + .roomServerAcl, + .roomTombstone, + .spaceChild, + .spaceParent, + .policyRuleRoom, + .policyRuleServer, + .policyRuleUser] + return .exclude(stateEventFilters.map { TimelineEventCondition.eventType($0) }) }() } diff --git a/project.yml b/project.yml index b7e780134..1e58952af 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.07 + exactVersion: 26.09.08 # path: ../matrix-rust-sdk Compound: path: compound-ios