From f16b9aad0a7522488156cc2e09bec13ea8059c2e Mon Sep 17 00:00:00 2001 From: Mauro <34335419+Velin92@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:24:22 +0200 Subject: [PATCH] Update SDK (#2941) --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 +- .../Mocks/Generated/SDKGeneratedMocks.swift | 72 +++++++++---------- .../Services/Timeline/TimelineProxy.swift | 9 ++- project.yml | 2 +- 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 4e75b827d..0ebacdc50 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -7388,7 +7388,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 1.0.16; + version = 1.0.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 bf2d524c9..b5e666e55 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -148,8 +148,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "52ff54bf80849c3a6725e24e8ea021a6aa67ab77", - "version" : "1.0.16" + "revision" : "f000a92169e856fba82c1bc0dd305b71e76b4bc9", + "version" : "1.0.17" } }, { diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift index 516ebe835..e470c04e4 100644 --- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift +++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift @@ -17180,16 +17180,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline { //MARK: - edit - open var editNewContentEditItemThrowableError: Error? - var editNewContentEditItemUnderlyingCallsCount = 0 - open var editNewContentEditItemCallsCount: Int { + open var editNewContentEventIdThrowableError: Error? + var editNewContentEventIdUnderlyingCallsCount = 0 + open var editNewContentEventIdCallsCount: Int { get { if Thread.isMainThread { - return editNewContentEditItemUnderlyingCallsCount + return editNewContentEventIdUnderlyingCallsCount } else { var returnValue: Int? = nil DispatchQueue.main.sync { - returnValue = editNewContentEditItemUnderlyingCallsCount + returnValue = editNewContentEventIdUnderlyingCallsCount } return returnValue! @@ -17197,31 +17197,31 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline { } set { if Thread.isMainThread { - editNewContentEditItemUnderlyingCallsCount = newValue + editNewContentEventIdUnderlyingCallsCount = newValue } else { DispatchQueue.main.sync { - editNewContentEditItemUnderlyingCallsCount = newValue + editNewContentEventIdUnderlyingCallsCount = newValue } } } } - open var editNewContentEditItemCalled: Bool { - return editNewContentEditItemCallsCount > 0 + open var editNewContentEventIdCalled: Bool { + return editNewContentEventIdCallsCount > 0 } - open var editNewContentEditItemReceivedArguments: (newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem)? - open var editNewContentEditItemReceivedInvocations: [(newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem)] = [] - open var editNewContentEditItemClosure: ((RoomMessageEventContentWithoutRelation, EventTimelineItem) async throws -> Void)? + open var editNewContentEventIdReceivedArguments: (newContent: RoomMessageEventContentWithoutRelation, eventId: String)? + open var editNewContentEventIdReceivedInvocations: [(newContent: RoomMessageEventContentWithoutRelation, eventId: String)] = [] + open var editNewContentEventIdClosure: ((RoomMessageEventContentWithoutRelation, String) async throws -> Void)? - open override func edit(newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem) async throws { - if let error = editNewContentEditItemThrowableError { + open override func edit(newContent: RoomMessageEventContentWithoutRelation, eventId: String) async throws { + if let error = editNewContentEventIdThrowableError { throw error } - editNewContentEditItemCallsCount += 1 - editNewContentEditItemReceivedArguments = (newContent: newContent, editItem: editItem) + editNewContentEventIdCallsCount += 1 + editNewContentEventIdReceivedArguments = (newContent: newContent, eventId: eventId) DispatchQueue.main.async { - self.editNewContentEditItemReceivedInvocations.append((newContent: newContent, editItem: editItem)) + self.editNewContentEventIdReceivedInvocations.append((newContent: newContent, eventId: eventId)) } - try await editNewContentEditItemClosure?(newContent, editItem) + try await editNewContentEventIdClosure?(newContent, eventId) } //MARK: - editPoll @@ -18360,16 +18360,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline { //MARK: - sendReply - open var sendReplyMsgReplyItemThrowableError: Error? - var sendReplyMsgReplyItemUnderlyingCallsCount = 0 - open var sendReplyMsgReplyItemCallsCount: Int { + open var sendReplyMsgEventIdThrowableError: Error? + var sendReplyMsgEventIdUnderlyingCallsCount = 0 + open var sendReplyMsgEventIdCallsCount: Int { get { if Thread.isMainThread { - return sendReplyMsgReplyItemUnderlyingCallsCount + return sendReplyMsgEventIdUnderlyingCallsCount } else { var returnValue: Int? = nil DispatchQueue.main.sync { - returnValue = sendReplyMsgReplyItemUnderlyingCallsCount + returnValue = sendReplyMsgEventIdUnderlyingCallsCount } return returnValue! @@ -18377,31 +18377,31 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline { } set { if Thread.isMainThread { - sendReplyMsgReplyItemUnderlyingCallsCount = newValue + sendReplyMsgEventIdUnderlyingCallsCount = newValue } else { DispatchQueue.main.sync { - sendReplyMsgReplyItemUnderlyingCallsCount = newValue + sendReplyMsgEventIdUnderlyingCallsCount = newValue } } } } - open var sendReplyMsgReplyItemCalled: Bool { - return sendReplyMsgReplyItemCallsCount > 0 + open var sendReplyMsgEventIdCalled: Bool { + return sendReplyMsgEventIdCallsCount > 0 } - open var sendReplyMsgReplyItemReceivedArguments: (msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem)? - open var sendReplyMsgReplyItemReceivedInvocations: [(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem)] = [] - open var sendReplyMsgReplyItemClosure: ((RoomMessageEventContentWithoutRelation, EventTimelineItem) async throws -> Void)? + open var sendReplyMsgEventIdReceivedArguments: (msg: RoomMessageEventContentWithoutRelation, eventId: String)? + open var sendReplyMsgEventIdReceivedInvocations: [(msg: RoomMessageEventContentWithoutRelation, eventId: String)] = [] + open var sendReplyMsgEventIdClosure: ((RoomMessageEventContentWithoutRelation, String) async throws -> Void)? - open override func sendReply(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem) async throws { - if let error = sendReplyMsgReplyItemThrowableError { + open override func sendReply(msg: RoomMessageEventContentWithoutRelation, eventId: String) async throws { + if let error = sendReplyMsgEventIdThrowableError { throw error } - sendReplyMsgReplyItemCallsCount += 1 - sendReplyMsgReplyItemReceivedArguments = (msg: msg, replyItem: replyItem) + sendReplyMsgEventIdCallsCount += 1 + sendReplyMsgEventIdReceivedArguments = (msg: msg, eventId: eventId) DispatchQueue.main.async { - self.sendReplyMsgReplyItemReceivedInvocations.append((msg: msg, replyItem: replyItem)) + self.sendReplyMsgEventIdReceivedInvocations.append((msg: msg, eventId: eventId)) } - try await sendReplyMsgReplyItemClosure?(msg, replyItem) + try await sendReplyMsgEventIdClosure?(msg, eventId) } //MARK: - sendVideo diff --git a/ElementX/Sources/Services/Timeline/TimelineProxy.swift b/ElementX/Sources/Services/Timeline/TimelineProxy.swift index 7b281b0e6..cac6aaaab 100644 --- a/ElementX/Sources/Services/Timeline/TimelineProxy.swift +++ b/ElementX/Sources/Services/Timeline/TimelineProxy.swift @@ -126,8 +126,8 @@ final class TimelineProxy: TimelineProxyProtocol { intentionalMentions: IntentionalMentions) async -> Result { MXLog.info("Editing timeline item: \(timelineItemID)") - guard let eventTimelineItem = await timelineProvider.itemProxies.firstEventTimelineItemUsingID(timelineItemID) else { - MXLog.error("Unknown timeline item: \(timelineItemID)") + guard let eventID = timelineItemID.eventID else { + MXLog.error("Missing event ID") return .failure(.failedEditing) } @@ -136,7 +136,7 @@ final class TimelineProxy: TimelineProxyProtocol { intentionalMentions: intentionalMentions.toRustMentions()) do { - try await timeline.edit(newContent: messageContent, editItem: eventTimelineItem) + try await timeline.edit(newContent: messageContent, eventId: eventID) MXLog.info("Finished editing timeline item: \(timelineItemID)") @@ -335,8 +335,7 @@ final class TimelineProxy: TimelineProxyProtocol { do { if let eventID { - let replyItem = try await timeline.getEventTimelineItemByEventId(eventId: eventID) - try await timeline.sendReply(msg: messageContent, replyItem: replyItem) + try await timeline.sendReply(msg: messageContent, eventId: eventID) MXLog.info("Finished sending reply to eventID: \(eventID)") } else { _ = try await timeline.send(msg: messageContent) diff --git a/project.yml b/project.yml index 47ed31e40..c2b13ea24 100644 --- a/project.yml +++ b/project.yml @@ -49,7 +49,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 1.0.16 + exactVersion: 1.0.17 # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios