diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index d683ec3f3..6bd508e60 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -8748,7 +8748,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 25.06.25; + version = "25.06.25-2"; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1fdd1bfd0..a0e5b3ba0 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -158,8 +158,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "28083837b3c743eb76b23c12c6ef5873668190e6", - "version" : "25.6.25" + "revision" : "302397835194e0bb73de876dc2ef2d3e1a7c7740", + "version" : "25.6.25-2" } }, { diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift index 9f4926969..0b3e86fdf 100644 --- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift +++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift @@ -554,16 +554,16 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { //MARK: - clearCaches - open var clearCachesThrowableError: Error? - var clearCachesUnderlyingCallsCount = 0 - open var clearCachesCallsCount: Int { + open var clearCachesSyncServiceThrowableError: Error? + var clearCachesSyncServiceUnderlyingCallsCount = 0 + open var clearCachesSyncServiceCallsCount: Int { get { if Thread.isMainThread { - return clearCachesUnderlyingCallsCount + return clearCachesSyncServiceUnderlyingCallsCount } else { var returnValue: Int? = nil DispatchQueue.main.sync { - returnValue = clearCachesUnderlyingCallsCount + returnValue = clearCachesSyncServiceUnderlyingCallsCount } return returnValue! @@ -571,25 +571,31 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { } set { if Thread.isMainThread { - clearCachesUnderlyingCallsCount = newValue + clearCachesSyncServiceUnderlyingCallsCount = newValue } else { DispatchQueue.main.sync { - clearCachesUnderlyingCallsCount = newValue + clearCachesSyncServiceUnderlyingCallsCount = newValue } } } } - open var clearCachesCalled: Bool { - return clearCachesCallsCount > 0 + open var clearCachesSyncServiceCalled: Bool { + return clearCachesSyncServiceCallsCount > 0 } - open var clearCachesClosure: (() async throws -> Void)? + open var clearCachesSyncServiceReceivedSyncService: SyncService? + open var clearCachesSyncServiceReceivedInvocations: [SyncService?] = [] + open var clearCachesSyncServiceClosure: ((SyncService?) async throws -> Void)? - open override func clearCaches() async throws { - if let error = clearCachesThrowableError { + open override func clearCaches(syncService: SyncService?) async throws { + if let error = clearCachesSyncServiceThrowableError { throw error } - clearCachesCallsCount += 1 - try await clearCachesClosure?() + clearCachesSyncServiceCallsCount += 1 + clearCachesSyncServiceReceivedSyncService = syncService + DispatchQueue.main.async { + self.clearCachesSyncServiceReceivedInvocations.append(syncService) + } + try await clearCachesSyncServiceClosure?(syncService) } //MARK: - createRoom @@ -13199,13 +13205,13 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { return isPublicCallsCount > 0 } - var isPublicUnderlyingReturnValue: Bool! - open var isPublicReturnValue: Bool! { + var isPublicUnderlyingReturnValue: Bool? + open var isPublicReturnValue: Bool? { get { if Thread.isMainThread { return isPublicUnderlyingReturnValue } else { - var returnValue: Bool? = nil + var returnValue: Bool?? = nil DispatchQueue.main.sync { returnValue = isPublicUnderlyingReturnValue } @@ -13223,9 +13229,9 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { } } } - open var isPublicClosure: (() -> Bool)? + open var isPublicClosure: (() -> Bool?)? - open override func isPublic() -> Bool { + open override func isPublic() -> Bool? { isPublicCallsCount += 1 if let isPublicClosure = isPublicClosure { return isPublicClosure() diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift index 7d266d327..2a03de51f 100644 --- a/ElementX/Sources/Services/Client/ClientProxy.swift +++ b/ElementX/Sources/Services/Client/ClientProxy.swift @@ -752,7 +752,7 @@ class ClientProxy: ClientProxyProtocol { func clearCaches() async -> Result { do { - return try await .success(client.clearCaches()) + return try await .success(client.clearCaches(syncService: syncService)) } catch { MXLog.error("Failed clearing client caches with error: \(error)") return .failure(.sdkError(error)) diff --git a/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift b/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift index 116cfbac4..5521f7740 100644 --- a/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift +++ b/ElementX/Sources/Services/ElementCall/ElementCallWidgetDriver.swift @@ -82,6 +82,7 @@ class ElementCallWidgetDriver: WidgetCapabilitiesProvider, ElementCallWidgetDriv widgetSettings = try newVirtualElementCallWidget(props: .init(elementCallUrl: baseURL.absoluteString, widgetId: widgetID, parentUrl: nil, + header: .appBar, hideHeader: nil, preload: nil, fontScale: nil, diff --git a/project.yml b/project.yml index aaeba51b3..2fc9d4a9b 100644 --- a/project.yml +++ b/project.yml @@ -65,7 +65,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 25.06.25 + exactVersion: 25.06.25-2 # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios