swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SDK (#2941)

Browse Source
This commit is contained in:
Mauro 2024-06-19 14:24:22 +02:00 committed by GitHub
parent 4a9de65030
commit f16b9aad0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX.xcodeproj/project.pbxproj
View File

@ -7388,7 +7388,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 = 1.0.16; version = 1.0.17;
}; };
}; };
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

4
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -148,8 +148,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" : "52ff54bf80849c3a6725e24e8ea021a6aa67ab77", "revision" : "f000a92169e856fba82c1bc0dd305b71e76b4bc9",
"version" : "1.0.16" "version" : "1.0.17"
} }
}, },
{ {

72
ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
View File

@ -17180,16 +17180,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline {
//MARK: - edit //MARK: - edit
open var editNewContentEditItemThrowableError: Error? open var editNewContentEventIdThrowableError: Error?
var editNewContentEditItemUnderlyingCallsCount = 0 var editNewContentEventIdUnderlyingCallsCount = 0
open var editNewContentEditItemCallsCount: Int { open var editNewContentEventIdCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return editNewContentEditItemUnderlyingCallsCount return editNewContentEventIdUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = editNewContentEditItemUnderlyingCallsCount returnValue = editNewContentEventIdUnderlyingCallsCount
} }
return returnValue! return returnValue!
@ -17197,31 +17197,31 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
editNewContentEditItemUnderlyingCallsCount = newValue editNewContentEventIdUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
editNewContentEditItemUnderlyingCallsCount = newValue editNewContentEventIdUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var editNewContentEditItemCalled: Bool { open var editNewContentEventIdCalled: Bool {
return editNewContentEditItemCallsCount > 0 return editNewContentEventIdCallsCount > 0
} }
open var editNewContentEditItemReceivedArguments: (newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem)? open var editNewContentEventIdReceivedArguments: (newContent: RoomMessageEventContentWithoutRelation, eventId: String)?
open var editNewContentEditItemReceivedInvocations: [(newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem)] = [] open var editNewContentEventIdReceivedInvocations: [(newContent: RoomMessageEventContentWithoutRelation, eventId: String)] = []
open var editNewContentEditItemClosure: ((RoomMessageEventContentWithoutRelation, EventTimelineItem) async throws -> Void)? open var editNewContentEventIdClosure: ((RoomMessageEventContentWithoutRelation, String) async throws -> Void)?
open override func edit(newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem) async throws { open override func edit(newContent: RoomMessageEventContentWithoutRelation, eventId: String) async throws {
if let error = editNewContentEditItemThrowableError { if let error = editNewContentEventIdThrowableError {
throw error throw error
} }
editNewContentEditItemCallsCount += 1 editNewContentEventIdCallsCount += 1
editNewContentEditItemReceivedArguments = (newContent: newContent, editItem: editItem) editNewContentEventIdReceivedArguments = (newContent: newContent, eventId: eventId)
DispatchQueue.main.async { 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 //MARK: - editPoll
@ -18360,16 +18360,16 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline {
//MARK: - sendReply //MARK: - sendReply
open var sendReplyMsgReplyItemThrowableError: Error? open var sendReplyMsgEventIdThrowableError: Error?
var sendReplyMsgReplyItemUnderlyingCallsCount = 0 var sendReplyMsgEventIdUnderlyingCallsCount = 0
open var sendReplyMsgReplyItemCallsCount: Int { open var sendReplyMsgEventIdCallsCount: Int {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return sendReplyMsgReplyItemUnderlyingCallsCount return sendReplyMsgEventIdUnderlyingCallsCount
} else { } else {
var returnValue: Int? = nil var returnValue: Int? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = sendReplyMsgReplyItemUnderlyingCallsCount returnValue = sendReplyMsgEventIdUnderlyingCallsCount
} }
return returnValue! return returnValue!
@ -18377,31 +18377,31 @@ open class TimelineSDKMock: MatrixRustSDK.Timeline {
} }
set { set {
if Thread.isMainThread { if Thread.isMainThread {
sendReplyMsgReplyItemUnderlyingCallsCount = newValue sendReplyMsgEventIdUnderlyingCallsCount = newValue
} else { } else {
DispatchQueue.main.sync { DispatchQueue.main.sync {
sendReplyMsgReplyItemUnderlyingCallsCount = newValue sendReplyMsgEventIdUnderlyingCallsCount = newValue
} }
} }
} }
} }
open var sendReplyMsgReplyItemCalled: Bool { open var sendReplyMsgEventIdCalled: Bool {
return sendReplyMsgReplyItemCallsCount > 0 return sendReplyMsgEventIdCallsCount > 0
} }
open var sendReplyMsgReplyItemReceivedArguments: (msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem)? open var sendReplyMsgEventIdReceivedArguments: (msg: RoomMessageEventContentWithoutRelation, eventId: String)?
open var sendReplyMsgReplyItemReceivedInvocations: [(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem)] = [] open var sendReplyMsgEventIdReceivedInvocations: [(msg: RoomMessageEventContentWithoutRelation, eventId: String)] = []
open var sendReplyMsgReplyItemClosure: ((RoomMessageEventContentWithoutRelation, EventTimelineItem) async throws -> Void)? open var sendReplyMsgEventIdClosure: ((RoomMessageEventContentWithoutRelation, String) async throws -> Void)?
open override func sendReply(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem) async throws { open override func sendReply(msg: RoomMessageEventContentWithoutRelation, eventId: String) async throws {
if let error = sendReplyMsgReplyItemThrowableError { if let error = sendReplyMsgEventIdThrowableError {
throw error throw error
} }
sendReplyMsgReplyItemCallsCount += 1 sendReplyMsgEventIdCallsCount += 1
sendReplyMsgReplyItemReceivedArguments = (msg: msg, replyItem: replyItem) sendReplyMsgEventIdReceivedArguments = (msg: msg, eventId: eventId)
DispatchQueue.main.async { 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 //MARK: - sendVideo

9
ElementX/Sources/Services/Timeline/TimelineProxy.swift
View File

@ -126,8 +126,8 @@ final class TimelineProxy: TimelineProxyProtocol {
intentionalMentions: IntentionalMentions) async -> Result<Void, TimelineProxyError> { intentionalMentions: IntentionalMentions) async -> Result<Void, TimelineProxyError> {
MXLog.info("Editing timeline item: \(timelineItemID)") MXLog.info("Editing timeline item: \(timelineItemID)")
guard let eventTimelineItem = await timelineProvider.itemProxies.firstEventTimelineItemUsingID(timelineItemID) else { guard let eventID = timelineItemID.eventID else {
MXLog.error("Unknown timeline item: \(timelineItemID)") MXLog.error("Missing event ID")
return .failure(.failedEditing) return .failure(.failedEditing)
} }
@ -136,7 +136,7 @@ final class TimelineProxy: TimelineProxyProtocol {
intentionalMentions: intentionalMentions.toRustMentions()) intentionalMentions: intentionalMentions.toRustMentions())
do { do {
try await timeline.edit(newContent: messageContent, editItem: eventTimelineItem) try await timeline.edit(newContent: messageContent, eventId: eventID)
MXLog.info("Finished editing timeline item: \(timelineItemID)") MXLog.info("Finished editing timeline item: \(timelineItemID)")
@ -335,8 +335,7 @@ final class TimelineProxy: TimelineProxyProtocol {
do { do {
if let eventID { if let eventID {
let replyItem = try await timeline.getEventTimelineItemByEventId(eventId: eventID) try await timeline.sendReply(msg: messageContent, eventId: eventID)
try await timeline.sendReply(msg: messageContent, replyItem: replyItem)
MXLog.info("Finished sending reply to eventID: \(eventID)") MXLog.info("Finished sending reply to eventID: \(eventID)")
} else { } else {
_ = try await timeline.send(msg: messageContent) _ = try await timeline.send(msg: messageContent)

2
project.yml
View File

@ -49,7 +49,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: 1.0.16 exactVersion: 1.0.17
# 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