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

Bump the RustSDK to v1.1.1

Browse Source
This commit is contained in:
aringenbach
2023-08-28 14:07:41 +02:00
committed by Stefan Ceriu
parent 5eb82d3c88
commit 24aebe4616
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -5527,7 +5527,7 @@
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift"; repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
requirement = { requirement = {
kind = exactVersion; kind = exactVersion;
version = 1.1.0; version = 1.1.1;
}; };
}; };
821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = { 821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2 -2
View File
@@ -129,8 +129,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/matrix-org/matrix-rust-components-swift", "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "533ed8078222a048749cc87f2a52378c85c7ed73", "revision" : "75cd9959b806665a066a1ea38f7441d80e899ce4",
"version" : "1.1.0" "version" : "1.1.1"
} }
}, },
{ {
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+7 -7
View File
@@ -928,10 +928,10 @@ class RoomProxyMock: RoomProxyProtocol {
} }
var messageEventContentForReceivedEventID: String? var messageEventContentForReceivedEventID: String?
var messageEventContentForReceivedInvocations: [String] = [] var messageEventContentForReceivedInvocations: [String] = []
var messageEventContentForReturnValue: RoomMessageEventContent? var messageEventContentForReturnValue: RoomMessageEventContentWithoutRelation?
var messageEventContentForClosure: ((String) -> RoomMessageEventContent?)? var messageEventContentForClosure: ((String) -> RoomMessageEventContentWithoutRelation?)?
func messageEventContent(for eventID: String) -> RoomMessageEventContent? { func messageEventContent(for eventID: String) -> RoomMessageEventContentWithoutRelation? {
messageEventContentForCallsCount += 1 messageEventContentForCallsCount += 1
messageEventContentForReceivedEventID = eventID messageEventContentForReceivedEventID = eventID
messageEventContentForReceivedInvocations.append(eventID) messageEventContentForReceivedInvocations.append(eventID)
@@ -947,12 +947,12 @@ class RoomProxyMock: RoomProxyProtocol {
var sendMessageEventContentCalled: Bool { var sendMessageEventContentCalled: Bool {
return sendMessageEventContentCallsCount > 0 return sendMessageEventContentCallsCount > 0
} }
var sendMessageEventContentReceivedMessageContent: RoomMessageEventContent? var sendMessageEventContentReceivedMessageContent: RoomMessageEventContentWithoutRelation?
var sendMessageEventContentReceivedInvocations: [RoomMessageEventContent] = [] var sendMessageEventContentReceivedInvocations: [RoomMessageEventContentWithoutRelation] = []
var sendMessageEventContentReturnValue: Result<Void, RoomProxyError>! var sendMessageEventContentReturnValue: Result<Void, RoomProxyError>!
var sendMessageEventContentClosure: ((RoomMessageEventContent) async -> Result<Void, RoomProxyError>)? var sendMessageEventContentClosure: ((RoomMessageEventContentWithoutRelation) async -> Result<Void, RoomProxyError>)?
func sendMessageEventContent(_ messageContent: RoomMessageEventContent) async -> Result<Void, RoomProxyError> { func sendMessageEventContent(_ messageContent: RoomMessageEventContentWithoutRelation) async -> Result<Void, RoomProxyError> {
sendMessageEventContentCallsCount += 1 sendMessageEventContentCallsCount += 1
sendMessageEventContentReceivedMessageContent = messageContent sendMessageEventContentReceivedMessageContent = messageContent
sendMessageEventContentReceivedInvocations.append(messageContent) sendMessageEventContentReceivedInvocations.append(messageContent)
ElementX/Sources/Services/Room/RoomProxy.swift
+6 -5
View File
@@ -238,11 +238,11 @@ class RoomProxy: RoomProxyProtocol {
} }
} }
func messageEventContent(for eventID: String) -> RoomMessageEventContent? { func messageEventContent(for eventID: String) -> RoomMessageEventContentWithoutRelation? {
try? room.getTimelineEventContentByEventId(eventId: eventID) try? room.getTimelineEventContentByEventId(eventId: eventID)
} }
func sendMessageEventContent(_ messageContent: RoomMessageEventContent) async -> Result<Void, RoomProxyError> { func sendMessageEventContent(_ messageContent: RoomMessageEventContentWithoutRelation) async -> Result<Void, RoomProxyError> {
sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true) sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true)
defer { defer {
sendMessageBackgroundTask?.stop() sendMessageBackgroundTask?.stop()
@@ -263,13 +263,13 @@ class RoomProxy: RoomProxyProtocol {
} }
let transactionId = genTransactionId() let transactionId = genTransactionId()
let messageContent = messageEventContentFromMarkdown(md: message)
return await Task.dispatch(on: messageSendingDispatchQueue) { return await Task.dispatch(on: messageSendingDispatchQueue) {
do { do {
if let eventID { if let eventID {
try self.room.sendReply(msg: message, inReplyToEventId: eventID, txnId: transactionId) try self.room.sendReply(msg: messageContent, inReplyToEventId: eventID, txnId: transactionId)
} else { } else {
let messageContent = messageEventContentFromMarkdown(md: message)
self.room.send(msg: messageContent, txnId: transactionId) self.room.send(msg: messageContent, txnId: transactionId)
} }
} catch { } catch {
@@ -447,7 +447,8 @@ class RoomProxy: RoomProxyProtocol {
return await Task.dispatch(on: messageSendingDispatchQueue) { return await Task.dispatch(on: messageSendingDispatchQueue) {
do { do {
try self.room.edit(newMsg: newMessage, originalEventId: eventID, txnId: transactionId) let newMessageContent = messageEventContentFromMarkdown(md: newMessage)
try self.room.edit(newMsg: newMessageContent, originalEventId: eventID, txnId: transactionId)
return .success(()) return .success(())
} catch { } catch {
return .failure(.failedEditingMessage) return .failure(.failedEditingMessage)
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+2 -2
View File
@@ -88,9 +88,9 @@ protocol RoomProxyProtocol {
func sendReadReceipt(for eventID: String) async -> Result<Void, RoomProxyError> func sendReadReceipt(for eventID: String) async -> Result<Void, RoomProxyError>
func messageEventContent(for eventID: String) -> RoomMessageEventContent? func messageEventContent(for eventID: String) -> RoomMessageEventContentWithoutRelation?
func sendMessageEventContent(_ messageContent: RoomMessageEventContent) async -> Result<Void, RoomProxyError> func sendMessageEventContent(_ messageContent: RoomMessageEventContentWithoutRelation) async -> Result<Void, RoomProxyError>
func sendMessage(_ message: String, inReplyTo eventID: String?) async -> Result<Void, RoomProxyError> func sendMessage(_ message: String, inReplyTo eventID: String?) async -> Result<Void, RoomProxyError>
project.yml
+1 -1
View File
@@ -45,7 +45,7 @@ packages:
# Element/Matrix dependencies # Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/matrix-org/matrix-rust-components-swift url: https://github.com/matrix-org/matrix-rust-components-swift
exactVersion: 1.1.0 exactVersion: 1.1.1
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
DesignKit: DesignKit:
path: DesignKit path: DesignKit