ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the SDK, handle API breaks. (#4418)

Browse Source
This commit is contained in:
Doug
2025-08-15 17:25:51 +01:00
committed by GitHub
parent e8d09aa841
commit ed8f446735
5 changed files with 215 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -9212,7 +9212,7 @@
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
requirement = { requirement = {
kind = exactVersion; kind = exactVersion;
version = 25.08.12; version = 25.08.15;
}; };
}; };
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2 -2
View File
@@ -158,8 +158,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/matrix-rust-components-swift", "location" : "https://github.com/element-hq/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "439f123dddf836855cfe006f01f6428f25ed847f", "revision" : "936eca21fc16862f01561e6512ec0344698acb71",
"version" : "25.8.12" "version" : "25.8.15"
} }
}, },
{ {
ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
+199 -130
View File
@@ -3972,6 +3972,75 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
} }
} }
//MARK: - serverVendorInfo
open var serverVendorInfoThrowableError: Error?
var serverVendorInfoUnderlyingCallsCount = 0
open var serverVendorInfoCallsCount: Int {
get {
if Thread.isMainThread {
return serverVendorInfoUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = serverVendorInfoUnderlyingCallsCount
}
return returnValue!
}
}
set {
if Thread.isMainThread {
serverVendorInfoUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
serverVendorInfoUnderlyingCallsCount = newValue
}
}
}
}
open var serverVendorInfoCalled: Bool {
return serverVendorInfoCallsCount > 0
}
var serverVendorInfoUnderlyingReturnValue: ServerVendorInfo!
open var serverVendorInfoReturnValue: ServerVendorInfo! {
get {
if Thread.isMainThread {
return serverVendorInfoUnderlyingReturnValue
} else {
var returnValue: ServerVendorInfo? = nil
DispatchQueue.main.sync {
returnValue = serverVendorInfoUnderlyingReturnValue
}
return returnValue!
}
}
set {
if Thread.isMainThread {
serverVendorInfoUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
serverVendorInfoUnderlyingReturnValue = newValue
}
}
}
}
open var serverVendorInfoClosure: (() async throws -> ServerVendorInfo)?
open override func serverVendorInfo() async throws -> ServerVendorInfo {
if let error = serverVendorInfoThrowableError {
throw error
}
serverVendorInfoCallsCount += 1
if let serverVendorInfoClosure = serverVendorInfoClosure {
return try await serverVendorInfoClosure()
} else {
return serverVendorInfoReturnValue
}
}
//MARK: - session //MARK: - session
open var sessionThrowableError: Error? open var sessionThrowableError: Error?
@@ -23027,16 +23096,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
//MARK: - sendAudio //MARK: - sendAudio
open var sendAudioParamsAudioInfoProgressWatcherThrowableError: Error? open var sendAudioParamsAudioInfoThrowableError: Error?
var sendAudioParamsAudioInfoProgressWatcherUnderlyingCallsCount = 0 var sendAudioParamsAudioInfoUnderlyingCallsCount = 0
open var sendAudioParamsAudioInfoProgressWatcherCallsCount: Int { open var sendAudioParamsAudioInfoCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendAudioParamsAudioInfoProgressWatcherUnderlyingCallsCount return sendAudioParamsAudioInfoUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendAudioParamsAudioInfoProgressWatcherUnderlyingCallsCount returnValue = sendAudioParamsAudioInfoUnderlyingCallsCount
} }
return returnValue! return returnValue!
@@ -23044,29 +23113,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendAudioParamsAudioInfoProgressWatcherUnderlyingCallsCount = newValue sendAudioParamsAudioInfoUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendAudioParamsAudioInfoProgressWatcherUnderlyingCallsCount = newValue sendAudioParamsAudioInfoUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var sendAudioParamsAudioInfoProgressWatcherCalled: Bool { open var sendAudioParamsAudioInfoCalled: Bool {
return sendAudioParamsAudioInfoProgressWatcherCallsCount > 0 return sendAudioParamsAudioInfoCallsCount > 0
} }
open var sendAudioParamsAudioInfoProgressWatcherReceivedArguments: (params: UploadParameters, audioInfo: AudioInfo, progressWatcher: ProgressWatcher?)? open var sendAudioParamsAudioInfoReceivedArguments: (params: UploadParameters, audioInfo: AudioInfo)?
open var sendAudioParamsAudioInfoProgressWatcherReceivedInvocations: [(params: UploadParameters, audioInfo: AudioInfo, progressWatcher: ProgressWatcher?)] = [] open var sendAudioParamsAudioInfoReceivedInvocations: [(params: UploadParameters, audioInfo: AudioInfo)] = []
var sendAudioParamsAudioInfoProgressWatcherUnderlyingReturnValue: SendAttachmentJoinHandle! var sendAudioParamsAudioInfoUnderlyingReturnValue: SendAttachmentJoinHandle!
open var sendAudioParamsAudioInfoProgressWatcherReturnValue: SendAttachmentJoinHandle! { open var sendAudioParamsAudioInfoReturnValue: SendAttachmentJoinHandle! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendAudioParamsAudioInfoProgressWatcherUnderlyingReturnValue return sendAudioParamsAudioInfoUnderlyingReturnValue
} else { } else {
var returnValue: SendAttachmentJoinHandle? = nil var returnValue: SendAttachmentJoinHandle? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendAudioParamsAudioInfoProgressWatcherUnderlyingReturnValue returnValue = sendAudioParamsAudioInfoUnderlyingReturnValue
} }
return returnValue! return returnValue!
@@ -23074,44 +23143,44 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendAudioParamsAudioInfoProgressWatcherUnderlyingReturnValue = newValue sendAudioParamsAudioInfoUnderlyingReturnValue = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendAudioParamsAudioInfoProgressWatcherUnderlyingReturnValue = newValue sendAudioParamsAudioInfoUnderlyingReturnValue = newValue
} }
} }
} }
} }
open var sendAudioParamsAudioInfoProgressWatcherClosure: ((UploadParameters, AudioInfo, ProgressWatcher?) throws -> SendAttachmentJoinHandle)? open var sendAudioParamsAudioInfoClosure: ((UploadParameters, AudioInfo) throws -> SendAttachmentJoinHandle)?
open override func sendAudio(params: UploadParameters, audioInfo: AudioInfo, progressWatcher: ProgressWatcher?) throws -> SendAttachmentJoinHandle { open override func sendAudio(params: UploadParameters, audioInfo: AudioInfo) throws -> SendAttachmentJoinHandle {
if let error = sendAudioParamsAudioInfoProgressWatcherThrowableError { if let error = sendAudioParamsAudioInfoThrowableError {
throw error throw error
} }
sendAudioParamsAudioInfoProgressWatcherCallsCount += 1 sendAudioParamsAudioInfoCallsCount += 1
sendAudioParamsAudioInfoProgressWatcherReceivedArguments = (params: params, audioInfo: audioInfo, progressWatcher: progressWatcher) sendAudioParamsAudioInfoReceivedArguments = (params: params, audioInfo: audioInfo)
DispatchQueue.main.async { DispatchQueue.main.async {
self.sendAudioParamsAudioInfoProgressWatcherReceivedInvocations.append((params: params, audioInfo: audioInfo, progressWatcher: progressWatcher)) self.sendAudioParamsAudioInfoReceivedInvocations.append((params: params, audioInfo: audioInfo))
} }
if let sendAudioParamsAudioInfoProgressWatcherClosure = sendAudioParamsAudioInfoProgressWatcherClosure { if let sendAudioParamsAudioInfoClosure = sendAudioParamsAudioInfoClosure {
return try sendAudioParamsAudioInfoProgressWatcherClosure(params, audioInfo, progressWatcher) return try sendAudioParamsAudioInfoClosure(params, audioInfo)
} else { } else {
return sendAudioParamsAudioInfoProgressWatcherReturnValue return sendAudioParamsAudioInfoReturnValue
} }
} }
//MARK: - sendFile //MARK: - sendFile
open var sendFileParamsFileInfoProgressWatcherThrowableError: Error? open var sendFileParamsFileInfoThrowableError: Error?
var sendFileParamsFileInfoProgressWatcherUnderlyingCallsCount = 0 var sendFileParamsFileInfoUnderlyingCallsCount = 0
open var sendFileParamsFileInfoProgressWatcherCallsCount: Int { open var sendFileParamsFileInfoCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendFileParamsFileInfoProgressWatcherUnderlyingCallsCount return sendFileParamsFileInfoUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendFileParamsFileInfoProgressWatcherUnderlyingCallsCount returnValue = sendFileParamsFileInfoUnderlyingCallsCount
} }
return returnValue! return returnValue!
@@ -23119,29 +23188,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendFileParamsFileInfoProgressWatcherUnderlyingCallsCount = newValue sendFileParamsFileInfoUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendFileParamsFileInfoProgressWatcherUnderlyingCallsCount = newValue sendFileParamsFileInfoUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var sendFileParamsFileInfoProgressWatcherCalled: Bool { open var sendFileParamsFileInfoCalled: Bool {
return sendFileParamsFileInfoProgressWatcherCallsCount > 0 return sendFileParamsFileInfoCallsCount > 0
} }
open var sendFileParamsFileInfoProgressWatcherReceivedArguments: (params: UploadParameters, fileInfo: FileInfo, progressWatcher: ProgressWatcher?)? open var sendFileParamsFileInfoReceivedArguments: (params: UploadParameters, fileInfo: FileInfo)?
open var sendFileParamsFileInfoProgressWatcherReceivedInvocations: [(params: UploadParameters, fileInfo: FileInfo, progressWatcher: ProgressWatcher?)] = [] open var sendFileParamsFileInfoReceivedInvocations: [(params: UploadParameters, fileInfo: FileInfo)] = []
var sendFileParamsFileInfoProgressWatcherUnderlyingReturnValue: SendAttachmentJoinHandle! var sendFileParamsFileInfoUnderlyingReturnValue: SendAttachmentJoinHandle!
open var sendFileParamsFileInfoProgressWatcherReturnValue: SendAttachmentJoinHandle! { open var sendFileParamsFileInfoReturnValue: SendAttachmentJoinHandle! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendFileParamsFileInfoProgressWatcherUnderlyingReturnValue return sendFileParamsFileInfoUnderlyingReturnValue
} else { } else {
var returnValue: SendAttachmentJoinHandle? = nil var returnValue: SendAttachmentJoinHandle? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendFileParamsFileInfoProgressWatcherUnderlyingReturnValue returnValue = sendFileParamsFileInfoUnderlyingReturnValue
} }
return returnValue! return returnValue!
@@ -23149,29 +23218,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendFileParamsFileInfoProgressWatcherUnderlyingReturnValue = newValue sendFileParamsFileInfoUnderlyingReturnValue = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendFileParamsFileInfoProgressWatcherUnderlyingReturnValue = newValue sendFileParamsFileInfoUnderlyingReturnValue = newValue
} }
} }
} }
} }
open var sendFileParamsFileInfoProgressWatcherClosure: ((UploadParameters, FileInfo, ProgressWatcher?) throws -> SendAttachmentJoinHandle)? open var sendFileParamsFileInfoClosure: ((UploadParameters, FileInfo) throws -> SendAttachmentJoinHandle)?
open override func sendFile(params: UploadParameters, fileInfo: FileInfo, progressWatcher: ProgressWatcher?) throws -> SendAttachmentJoinHandle { open override func sendFile(params: UploadParameters, fileInfo: FileInfo) throws -> SendAttachmentJoinHandle {
if let error = sendFileParamsFileInfoProgressWatcherThrowableError { if let error = sendFileParamsFileInfoThrowableError {
throw error throw error
} }
sendFileParamsFileInfoProgressWatcherCallsCount += 1 sendFileParamsFileInfoCallsCount += 1
sendFileParamsFileInfoProgressWatcherReceivedArguments = (params: params, fileInfo: fileInfo, progressWatcher: progressWatcher) sendFileParamsFileInfoReceivedArguments = (params: params, fileInfo: fileInfo)
DispatchQueue.main.async { DispatchQueue.main.async {
self.sendFileParamsFileInfoProgressWatcherReceivedInvocations.append((params: params, fileInfo: fileInfo, progressWatcher: progressWatcher)) self.sendFileParamsFileInfoReceivedInvocations.append((params: params, fileInfo: fileInfo))
} }
if let sendFileParamsFileInfoProgressWatcherClosure = sendFileParamsFileInfoProgressWatcherClosure { if let sendFileParamsFileInfoClosure = sendFileParamsFileInfoClosure {
return try sendFileParamsFileInfoProgressWatcherClosure(params, fileInfo, progressWatcher) return try sendFileParamsFileInfoClosure(params, fileInfo)
} else { } else {
return sendFileParamsFileInfoProgressWatcherReturnValue return sendFileParamsFileInfoReturnValue
} }
} }
@@ -23252,16 +23321,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
//MARK: - sendImage //MARK: - sendImage
open var sendImageParamsThumbnailPathImageInfoProgressWatcherThrowableError: Error? open var sendImageParamsThumbnailSourceImageInfoThrowableError: Error?
var sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingCallsCount = 0 var sendImageParamsThumbnailSourceImageInfoUnderlyingCallsCount = 0
open var sendImageParamsThumbnailPathImageInfoProgressWatcherCallsCount: Int { open var sendImageParamsThumbnailSourceImageInfoCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingCallsCount return sendImageParamsThumbnailSourceImageInfoUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingCallsCount returnValue = sendImageParamsThumbnailSourceImageInfoUnderlyingCallsCount
} }
return returnValue! return returnValue!
@@ -23269,29 +23338,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingCallsCount = newValue sendImageParamsThumbnailSourceImageInfoUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingCallsCount = newValue sendImageParamsThumbnailSourceImageInfoUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var sendImageParamsThumbnailPathImageInfoProgressWatcherCalled: Bool { open var sendImageParamsThumbnailSourceImageInfoCalled: Bool {
return sendImageParamsThumbnailPathImageInfoProgressWatcherCallsCount > 0 return sendImageParamsThumbnailSourceImageInfoCallsCount > 0
} }
open var sendImageParamsThumbnailPathImageInfoProgressWatcherReceivedArguments: (params: UploadParameters, thumbnailPath: String?, imageInfo: ImageInfo, progressWatcher: ProgressWatcher?)? open var sendImageParamsThumbnailSourceImageInfoReceivedArguments: (params: UploadParameters, thumbnailSource: UploadSource?, imageInfo: ImageInfo)?
open var sendImageParamsThumbnailPathImageInfoProgressWatcherReceivedInvocations: [(params: UploadParameters, thumbnailPath: String?, imageInfo: ImageInfo, progressWatcher: ProgressWatcher?)] = [] open var sendImageParamsThumbnailSourceImageInfoReceivedInvocations: [(params: UploadParameters, thumbnailSource: UploadSource?, imageInfo: ImageInfo)] = []
var sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingReturnValue: SendAttachmentJoinHandle! var sendImageParamsThumbnailSourceImageInfoUnderlyingReturnValue: SendAttachmentJoinHandle!
open var sendImageParamsThumbnailPathImageInfoProgressWatcherReturnValue: SendAttachmentJoinHandle! { open var sendImageParamsThumbnailSourceImageInfoReturnValue: SendAttachmentJoinHandle! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingReturnValue return sendImageParamsThumbnailSourceImageInfoUnderlyingReturnValue
} else { } else {
var returnValue: SendAttachmentJoinHandle? = nil var returnValue: SendAttachmentJoinHandle? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingReturnValue returnValue = sendImageParamsThumbnailSourceImageInfoUnderlyingReturnValue
} }
return returnValue! return returnValue!
@@ -23299,29 +23368,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingReturnValue = newValue sendImageParamsThumbnailSourceImageInfoUnderlyingReturnValue = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendImageParamsThumbnailPathImageInfoProgressWatcherUnderlyingReturnValue = newValue sendImageParamsThumbnailSourceImageInfoUnderlyingReturnValue = newValue
} }
} }
} }
} }
open var sendImageParamsThumbnailPathImageInfoProgressWatcherClosure: ((UploadParameters, String?, ImageInfo, ProgressWatcher?) throws -> SendAttachmentJoinHandle)? open var sendImageParamsThumbnailSourceImageInfoClosure: ((UploadParameters, UploadSource?, ImageInfo) throws -> SendAttachmentJoinHandle)?
open override func sendImage(params: UploadParameters, thumbnailPath: String?, imageInfo: ImageInfo, progressWatcher: ProgressWatcher?) throws -> SendAttachmentJoinHandle { open override func sendImage(params: UploadParameters, thumbnailSource: UploadSource?, imageInfo: ImageInfo) throws -> SendAttachmentJoinHandle {
if let error = sendImageParamsThumbnailPathImageInfoProgressWatcherThrowableError { if let error = sendImageParamsThumbnailSourceImageInfoThrowableError {
throw error throw error
} }
sendImageParamsThumbnailPathImageInfoProgressWatcherCallsCount += 1 sendImageParamsThumbnailSourceImageInfoCallsCount += 1
sendImageParamsThumbnailPathImageInfoProgressWatcherReceivedArguments = (params: params, thumbnailPath: thumbnailPath, imageInfo: imageInfo, progressWatcher: progressWatcher) sendImageParamsThumbnailSourceImageInfoReceivedArguments = (params: params, thumbnailSource: thumbnailSource, imageInfo: imageInfo)
DispatchQueue.main.async { DispatchQueue.main.async {
self.sendImageParamsThumbnailPathImageInfoProgressWatcherReceivedInvocations.append((params: params, thumbnailPath: thumbnailPath, imageInfo: imageInfo, progressWatcher: progressWatcher)) self.sendImageParamsThumbnailSourceImageInfoReceivedInvocations.append((params: params, thumbnailSource: thumbnailSource, imageInfo: imageInfo))
} }
if let sendImageParamsThumbnailPathImageInfoProgressWatcherClosure = sendImageParamsThumbnailPathImageInfoProgressWatcherClosure { if let sendImageParamsThumbnailSourceImageInfoClosure = sendImageParamsThumbnailSourceImageInfoClosure {
return try sendImageParamsThumbnailPathImageInfoProgressWatcherClosure(params, thumbnailPath, imageInfo, progressWatcher) return try sendImageParamsThumbnailSourceImageInfoClosure(params, thumbnailSource, imageInfo)
} else { } else {
return sendImageParamsThumbnailPathImageInfoProgressWatcherReturnValue return sendImageParamsThumbnailSourceImageInfoReturnValue
} }
} }
@@ -23511,16 +23580,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
//MARK: - sendVideo //MARK: - sendVideo
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherThrowableError: Error? open var sendVideoParamsThumbnailSourceVideoInfoThrowableError: Error?
var sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingCallsCount = 0 var sendVideoParamsThumbnailSourceVideoInfoUnderlyingCallsCount = 0
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherCallsCount: Int { open var sendVideoParamsThumbnailSourceVideoInfoCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingCallsCount return sendVideoParamsThumbnailSourceVideoInfoUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingCallsCount returnValue = sendVideoParamsThumbnailSourceVideoInfoUnderlyingCallsCount
} }
return returnValue! return returnValue!
@@ -23528,29 +23597,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingCallsCount = newValue sendVideoParamsThumbnailSourceVideoInfoUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingCallsCount = newValue sendVideoParamsThumbnailSourceVideoInfoUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherCalled: Bool { open var sendVideoParamsThumbnailSourceVideoInfoCalled: Bool {
return sendVideoParamsThumbnailPathVideoInfoProgressWatcherCallsCount > 0 return sendVideoParamsThumbnailSourceVideoInfoCallsCount > 0
} }
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherReceivedArguments: (params: UploadParameters, thumbnailPath: String?, videoInfo: VideoInfo, progressWatcher: ProgressWatcher?)? open var sendVideoParamsThumbnailSourceVideoInfoReceivedArguments: (params: UploadParameters, thumbnailSource: UploadSource?, videoInfo: VideoInfo)?
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherReceivedInvocations: [(params: UploadParameters, thumbnailPath: String?, videoInfo: VideoInfo, progressWatcher: ProgressWatcher?)] = [] open var sendVideoParamsThumbnailSourceVideoInfoReceivedInvocations: [(params: UploadParameters, thumbnailSource: UploadSource?, videoInfo: VideoInfo)] = []
var sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingReturnValue: SendAttachmentJoinHandle! var sendVideoParamsThumbnailSourceVideoInfoUnderlyingReturnValue: SendAttachmentJoinHandle!
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherReturnValue: SendAttachmentJoinHandle! { open var sendVideoParamsThumbnailSourceVideoInfoReturnValue: SendAttachmentJoinHandle! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingReturnValue return sendVideoParamsThumbnailSourceVideoInfoUnderlyingReturnValue
} else { } else {
var returnValue: SendAttachmentJoinHandle? = nil var returnValue: SendAttachmentJoinHandle? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingReturnValue returnValue = sendVideoParamsThumbnailSourceVideoInfoUnderlyingReturnValue
} }
return returnValue! return returnValue!
@@ -23558,44 +23627,44 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingReturnValue = newValue sendVideoParamsThumbnailSourceVideoInfoUnderlyingReturnValue = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendVideoParamsThumbnailPathVideoInfoProgressWatcherUnderlyingReturnValue = newValue sendVideoParamsThumbnailSourceVideoInfoUnderlyingReturnValue = newValue
} }
} }
} }
} }
open var sendVideoParamsThumbnailPathVideoInfoProgressWatcherClosure: ((UploadParameters, String?, VideoInfo, ProgressWatcher?) throws -> SendAttachmentJoinHandle)? open var sendVideoParamsThumbnailSourceVideoInfoClosure: ((UploadParameters, UploadSource?, VideoInfo) throws -> SendAttachmentJoinHandle)?
open override func sendVideo(params: UploadParameters, thumbnailPath: String?, videoInfo: VideoInfo, progressWatcher: ProgressWatcher?) throws -> SendAttachmentJoinHandle { open override func sendVideo(params: UploadParameters, thumbnailSource: UploadSource?, videoInfo: VideoInfo) throws -> SendAttachmentJoinHandle {
if let error = sendVideoParamsThumbnailPathVideoInfoProgressWatcherThrowableError { if let error = sendVideoParamsThumbnailSourceVideoInfoThrowableError {
throw error throw error
} }
sendVideoParamsThumbnailPathVideoInfoProgressWatcherCallsCount += 1 sendVideoParamsThumbnailSourceVideoInfoCallsCount += 1
sendVideoParamsThumbnailPathVideoInfoProgressWatcherReceivedArguments = (params: params, thumbnailPath: thumbnailPath, videoInfo: videoInfo, progressWatcher: progressWatcher) sendVideoParamsThumbnailSourceVideoInfoReceivedArguments = (params: params, thumbnailSource: thumbnailSource, videoInfo: videoInfo)
DispatchQueue.main.async { DispatchQueue.main.async {
self.sendVideoParamsThumbnailPathVideoInfoProgressWatcherReceivedInvocations.append((params: params, thumbnailPath: thumbnailPath, videoInfo: videoInfo, progressWatcher: progressWatcher)) self.sendVideoParamsThumbnailSourceVideoInfoReceivedInvocations.append((params: params, thumbnailSource: thumbnailSource, videoInfo: videoInfo))
} }
if let sendVideoParamsThumbnailPathVideoInfoProgressWatcherClosure = sendVideoParamsThumbnailPathVideoInfoProgressWatcherClosure { if let sendVideoParamsThumbnailSourceVideoInfoClosure = sendVideoParamsThumbnailSourceVideoInfoClosure {
return try sendVideoParamsThumbnailPathVideoInfoProgressWatcherClosure(params, thumbnailPath, videoInfo, progressWatcher) return try sendVideoParamsThumbnailSourceVideoInfoClosure(params, thumbnailSource, videoInfo)
} else { } else {
return sendVideoParamsThumbnailPathVideoInfoProgressWatcherReturnValue return sendVideoParamsThumbnailSourceVideoInfoReturnValue
} }
} }
//MARK: - sendVoiceMessage //MARK: - sendVoiceMessage
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherThrowableError: Error? open var sendVoiceMessageParamsAudioInfoWaveformThrowableError: Error?
var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingCallsCount = 0 var sendVoiceMessageParamsAudioInfoWaveformUnderlyingCallsCount = 0
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherCallsCount: Int { open var sendVoiceMessageParamsAudioInfoWaveformCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingCallsCount return sendVoiceMessageParamsAudioInfoWaveformUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingCallsCount returnValue = sendVoiceMessageParamsAudioInfoWaveformUnderlyingCallsCount
} }
return returnValue! return returnValue!
@@ -23603,29 +23672,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingCallsCount = newValue sendVoiceMessageParamsAudioInfoWaveformUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingCallsCount = newValue sendVoiceMessageParamsAudioInfoWaveformUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherCalled: Bool { open var sendVoiceMessageParamsAudioInfoWaveformCalled: Bool {
return sendVoiceMessageParamsAudioInfoWaveformProgressWatcherCallsCount > 0 return sendVoiceMessageParamsAudioInfoWaveformCallsCount > 0
} }
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherReceivedArguments: (params: UploadParameters, audioInfo: AudioInfo, waveform: [UInt16], progressWatcher: ProgressWatcher?)? open var sendVoiceMessageParamsAudioInfoWaveformReceivedArguments: (params: UploadParameters, audioInfo: AudioInfo, waveform: [UInt16])?
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherReceivedInvocations: [(params: UploadParameters, audioInfo: AudioInfo, waveform: [UInt16], progressWatcher: ProgressWatcher?)] = [] open var sendVoiceMessageParamsAudioInfoWaveformReceivedInvocations: [(params: UploadParameters, audioInfo: AudioInfo, waveform: [UInt16])] = []
var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingReturnValue: SendAttachmentJoinHandle! var sendVoiceMessageParamsAudioInfoWaveformUnderlyingReturnValue: SendAttachmentJoinHandle!
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherReturnValue: SendAttachmentJoinHandle! { open var sendVoiceMessageParamsAudioInfoWaveformReturnValue: SendAttachmentJoinHandle! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingReturnValue return sendVoiceMessageParamsAudioInfoWaveformUnderlyingReturnValue
} else { } else {
var returnValue: SendAttachmentJoinHandle? = nil var returnValue: SendAttachmentJoinHandle? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingReturnValue returnValue = sendVoiceMessageParamsAudioInfoWaveformUnderlyingReturnValue
} }
return returnValue! return returnValue!
@@ -23633,29 +23702,29 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline, @unchecked Sendable {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingReturnValue = newValue sendVoiceMessageParamsAudioInfoWaveformUnderlyingReturnValue = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendVoiceMessageParamsAudioInfoWaveformProgressWatcherUnderlyingReturnValue = newValue sendVoiceMessageParamsAudioInfoWaveformUnderlyingReturnValue = newValue
} }
} }
} }
} }
open var sendVoiceMessageParamsAudioInfoWaveformProgressWatcherClosure: ((UploadParameters, AudioInfo, [UInt16], ProgressWatcher?) throws -> SendAttachmentJoinHandle)? open var sendVoiceMessageParamsAudioInfoWaveformClosure: ((UploadParameters, AudioInfo, [UInt16]) throws -> SendAttachmentJoinHandle)?
open override func sendVoiceMessage(params: UploadParameters, audioInfo: AudioInfo, waveform: [UInt16], progressWatcher: ProgressWatcher?) throws -> SendAttachmentJoinHandle { open override func sendVoiceMessage(params: UploadParameters, audioInfo: AudioInfo, waveform: [UInt16]) throws -> SendAttachmentJoinHandle {
if let error = sendVoiceMessageParamsAudioInfoWaveformProgressWatcherThrowableError { if let error = sendVoiceMessageParamsAudioInfoWaveformThrowableError {
throw error throw error
} }
sendVoiceMessageParamsAudioInfoWaveformProgressWatcherCallsCount += 1 sendVoiceMessageParamsAudioInfoWaveformCallsCount += 1
sendVoiceMessageParamsAudioInfoWaveformProgressWatcherReceivedArguments = (params: params, audioInfo: audioInfo, waveform: waveform, progressWatcher: progressWatcher) sendVoiceMessageParamsAudioInfoWaveformReceivedArguments = (params: params, audioInfo: audioInfo, waveform: waveform)
DispatchQueue.main.async { DispatchQueue.main.async {
self.sendVoiceMessageParamsAudioInfoWaveformProgressWatcherReceivedInvocations.append((params: params, audioInfo: audioInfo, waveform: waveform, progressWatcher: progressWatcher)) self.sendVoiceMessageParamsAudioInfoWaveformReceivedInvocations.append((params: params, audioInfo: audioInfo, waveform: waveform))
} }
if let sendVoiceMessageParamsAudioInfoWaveformProgressWatcherClosure = sendVoiceMessageParamsAudioInfoWaveformProgressWatcherClosure { if let sendVoiceMessageParamsAudioInfoWaveformClosure = sendVoiceMessageParamsAudioInfoWaveformClosure {
return try sendVoiceMessageParamsAudioInfoWaveformProgressWatcherClosure(params, audioInfo, waveform, progressWatcher) return try sendVoiceMessageParamsAudioInfoWaveformClosure(params, audioInfo, waveform)
} else { } else {
return sendVoiceMessageParamsAudioInfoWaveformProgressWatcherReturnValue return sendVoiceMessageParamsAudioInfoWaveformReturnValue
} }
} }
ElementX/Sources/Services/Timeline/TimelineProxy.swift
+12 -22
View File
@@ -237,10 +237,8 @@ final class TimelineProxy: TimelineProxyProtocol {
caption: caption, caption: caption,
formattedCaption: nil, // Rust will build this from the caption's markdown. formattedCaption: nil, // Rust will build this from the caption's markdown.
mentions: nil, mentions: nil,
inReplyTo: nil, inReplyTo: nil),
useSendQueue: true), audioInfo: audioInfo)
audioInfo: audioInfo,
progressWatcher: nil)
await requestHandle(handle) await requestHandle(handle)
@@ -265,10 +263,8 @@ final class TimelineProxy: TimelineProxyProtocol {
caption: caption, caption: caption,
formattedCaption: nil, // Rust will build this from the caption's markdown. formattedCaption: nil, // Rust will build this from the caption's markdown.
mentions: nil, mentions: nil,
inReplyTo: nil, inReplyTo: nil),
useSendQueue: true), fileInfo: fileInfo)
fileInfo: fileInfo,
progressWatcher: nil)
await requestHandle(handle) await requestHandle(handle)
@@ -294,11 +290,9 @@ final class TimelineProxy: TimelineProxyProtocol {
caption: caption, caption: caption,
formattedCaption: nil, // Rust will build this from the caption's markdown. formattedCaption: nil, // Rust will build this from the caption's markdown.
mentions: nil, mentions: nil,
inReplyTo: nil, inReplyTo: nil),
useSendQueue: true), thumbnailSource: .file(filename: thumbnailURL.path(percentEncoded: false)),
thumbnailPath: thumbnailURL.path(percentEncoded: false), imageInfo: imageInfo)
imageInfo: imageInfo,
progressWatcher: nil)
await requestHandle(handle) await requestHandle(handle)
@@ -348,11 +342,9 @@ final class TimelineProxy: TimelineProxyProtocol {
caption: caption, caption: caption,
formattedCaption: nil, formattedCaption: nil,
mentions: nil, mentions: nil,
inReplyTo: nil, inReplyTo: nil),
useSendQueue: true), thumbnailSource: .file(filename: thumbnailURL.path(percentEncoded: false)),
thumbnailPath: thumbnailURL.path(percentEncoded: false), videoInfo: videoInfo)
videoInfo: videoInfo,
progressWatcher: nil)
await requestHandle(handle) await requestHandle(handle)
@@ -377,11 +369,9 @@ final class TimelineProxy: TimelineProxyProtocol {
caption: nil, caption: nil,
formattedCaption: nil, formattedCaption: nil,
mentions: nil, mentions: nil,
inReplyTo: nil, inReplyTo: nil),
useSendQueue: true),
audioInfo: audioInfo, audioInfo: audioInfo,
waveform: waveform, waveform: waveform)
progressWatcher: nil)
await requestHandle(handle) await requestHandle(handle)
project.yml
+1 -1
View File
@@ -68,7 +68,7 @@ packages:
# Element/Matrix dependencies # Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/element-hq/matrix-rust-components-swift url: https://github.com/element-hq/matrix-rust-components-swift
exactVersion: 25.08.12 exactVersion: 25.08.15
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios