Skip to content

Commit 5f3a195

Browse files
committed
Bump to v1.1.20 (matrix-rust-sdk 956d5ef7e704930648e0b2da2f03a18a7c4d305b)
1 parent 8f03dc0 commit 5f3a195

File tree

2 files changed

+55
-53
lines changed

2 files changed

+55
-53
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import PackageDescription
55

6-
let checksum = "b0c0643ebacf79aacc2b8ce63901f56b57414b5992d226aebf7a5eb4cde02852"
7-
let version = "v1.1.19"
6+
let checksum = "18fe309d16894f6536339f310d09df9f3b721c938354ecc948ee75f3b8d4becd"
7+
let version = "v1.1.20"
88
let url = "https://github.com/matrix-org/matrix-rust-components-swift/releases/download/\(version)/MatrixSDKFFI.xcframework.zip"
99

1010
let package = Package(

Sources/MatrixRustSDK/matrix_sdk_ffi.swift

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2849,10 +2849,10 @@ public protocol RoomProtocol {
28492849
func canUserTriggerRoomNotificationBlocking(userId: String) throws -> Bool
28502850
func cancelSend(txnId: String)
28512851
func canonicalAlias() -> String?
2852-
func createPoll(question: String, answers: [String], maxSelections: UInt8, pollKind: PollKind, txnId: String?) throws
2852+
func createPoll(question: String, answers: [String], maxSelections: UInt8, pollKind: PollKind) throws
28532853
func displayName() throws -> String
2854-
func edit(newMsg: RoomMessageEventContentWithoutRelation, originalEventId: String, txnId: String?) throws
2855-
func endPoll(pollStartId: String, text: String, txnId: String?) throws
2854+
func edit(newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem) throws
2855+
func endPoll(pollStartId: String, text: String) throws
28562856
func fetchDetailsForEvent(eventId: String) throws
28572857
func fetchMembers() async throws
28582858
func fetchMembersBlocking() throws
@@ -2881,23 +2881,23 @@ public protocol RoomProtocol {
28812881
func name() -> String?
28822882
func ownUserId() -> String
28832883
func paginateBackwards(opts: PaginationOptions) throws
2884-
func redact(eventId: String, reason: String?, txnId: String?) throws
2884+
func redact(eventId: String, reason: String?) throws
28852885
func removeAvatar() throws
28862886
func removeTimeline()
28872887
func reportContent(eventId: String, score: Int32?, reason: String?) throws
28882888
func retryDecryption(sessionIds: [String])
28892889
func retrySend(txnId: String)
28902890
func roomInfo() async throws -> RoomInfo
28912891
func roomInfoBlocking() throws -> RoomInfo
2892-
func send(msg: RoomMessageEventContentWithoutRelation, txnId: String?)
2892+
func send(msg: RoomMessageEventContentWithoutRelation)
28932893
func sendAudio(url: String, audioInfo: AudioInfo, progressWatcher: ProgressWatcher?) -> SendAttachmentJoinHandle
28942894
func sendFile(url: String, fileInfo: FileInfo, progressWatcher: ProgressWatcher?) -> SendAttachmentJoinHandle
28952895
func sendImage(url: String, thumbnailUrl: String, imageInfo: ImageInfo, progressWatcher: ProgressWatcher?) -> SendAttachmentJoinHandle
2896-
func sendLocation(body: String, geoUri: String, description: String?, zoomLevel: UInt8?, assetType: AssetType?, txnId: String?)
2897-
func sendPollResponse(pollStartId: String, answers: [String], txnId: String?) throws
2896+
func sendLocation(body: String, geoUri: String, description: String?, zoomLevel: UInt8?, assetType: AssetType?)
2897+
func sendPollResponse(pollStartId: String, answers: [String]) throws
28982898
func sendReadMarker(fullyReadEventId: String, readReceiptEventId: String?) throws
28992899
func sendReadReceipt(eventId: String) throws
2900-
func sendReply(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem, txnId: String?) throws
2900+
func sendReply(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem) throws
29012901
func sendVideo(url: String, thumbnailUrl: String, videoInfo: VideoInfo, progressWatcher: ProgressWatcher?) -> SendAttachmentJoinHandle
29022902
func setName(name: String) throws
29032903
func setTopic(topic: String) throws
@@ -3288,15 +3288,14 @@ public class Room: RoomProtocol {
32883288
)
32893289
}
32903290

3291-
public func createPoll(question: String, answers: [String], maxSelections: UInt8, pollKind: PollKind, txnId: String?) throws {
3291+
public func createPoll(question: String, answers: [String], maxSelections: UInt8, pollKind: PollKind) throws {
32923292
try
32933293
rustCallWithError(FfiConverterTypeClientError.lift) {
32943294
uniffi_matrix_sdk_ffi_fn_method_room_create_poll(self.pointer,
32953295
FfiConverterString.lower(question),
32963296
FfiConverterSequenceString.lower(answers),
32973297
FfiConverterUInt8.lower(maxSelections),
3298-
FfiConverterTypePollKind.lower(pollKind),
3299-
FfiConverterOptionString.lower(txnId),$0
3298+
FfiConverterTypePollKind.lower(pollKind),$0
33003299
)
33013300
}
33023301
}
@@ -3311,24 +3310,22 @@ public class Room: RoomProtocol {
33113310
)
33123311
}
33133312

3314-
public func edit(newMsg: RoomMessageEventContentWithoutRelation, originalEventId: String, txnId: String?) throws {
3313+
public func edit(newContent: RoomMessageEventContentWithoutRelation, editItem: EventTimelineItem) throws {
33153314
try
33163315
rustCallWithError(FfiConverterTypeClientError.lift) {
33173316
uniffi_matrix_sdk_ffi_fn_method_room_edit(self.pointer,
3318-
FfiConverterTypeRoomMessageEventContentWithoutRelation.lower(newMsg),
3319-
FfiConverterString.lower(originalEventId),
3320-
FfiConverterOptionString.lower(txnId),$0
3317+
FfiConverterTypeRoomMessageEventContentWithoutRelation.lower(newContent),
3318+
FfiConverterTypeEventTimelineItem.lower(editItem),$0
33213319
)
33223320
}
33233321
}
33243322

3325-
public func endPoll(pollStartId: String, text: String, txnId: String?) throws {
3323+
public func endPoll(pollStartId: String, text: String) throws {
33263324
try
33273325
rustCallWithError(FfiConverterTypeClientError.lift) {
33283326
uniffi_matrix_sdk_ffi_fn_method_room_end_poll(self.pointer,
33293327
FfiConverterString.lower(pollStartId),
3330-
FfiConverterString.lower(text),
3331-
FfiConverterOptionString.lower(txnId),$0
3328+
FfiConverterString.lower(text),$0
33323329
)
33333330
}
33343331
}
@@ -3662,13 +3659,12 @@ public class Room: RoomProtocol {
36623659
}
36633660
}
36643661

3665-
public func redact(eventId: String, reason: String?, txnId: String?) throws {
3662+
public func redact(eventId: String, reason: String?) throws {
36663663
try
36673664
rustCallWithError(FfiConverterTypeClientError.lift) {
36683665
uniffi_matrix_sdk_ffi_fn_method_room_redact(self.pointer,
36693666
FfiConverterString.lower(eventId),
3670-
FfiConverterOptionString.lower(reason),
3671-
FfiConverterOptionString.lower(txnId),$0
3667+
FfiConverterOptionString.lower(reason),$0
36723668
)
36733669
}
36743670
}
@@ -3755,13 +3751,12 @@ public class Room: RoomProtocol {
37553751
)
37563752
}
37573753

3758-
public func send(msg: RoomMessageEventContentWithoutRelation, txnId: String?) {
3754+
public func send(msg: RoomMessageEventContentWithoutRelation) {
37593755
try!
37603756
rustCall() {
37613757

37623758
uniffi_matrix_sdk_ffi_fn_method_room_send(self.pointer,
3763-
FfiConverterTypeRoomMessageEventContentWithoutRelation.lower(msg),
3764-
FfiConverterOptionString.lower(txnId),$0
3759+
FfiConverterTypeRoomMessageEventContentWithoutRelation.lower(msg),$0
37653760
)
37663761
}
37673762
}
@@ -3809,7 +3804,7 @@ public class Room: RoomProtocol {
38093804
)
38103805
}
38113806

3812-
public func sendLocation(body: String, geoUri: String, description: String?, zoomLevel: UInt8?, assetType: AssetType?, txnId: String?) {
3807+
public func sendLocation(body: String, geoUri: String, description: String?, zoomLevel: UInt8?, assetType: AssetType?) {
38133808
try!
38143809
rustCall() {
38153810

@@ -3818,19 +3813,17 @@ public class Room: RoomProtocol {
38183813
FfiConverterString.lower(geoUri),
38193814
FfiConverterOptionString.lower(description),
38203815
FfiConverterOptionUInt8.lower(zoomLevel),
3821-
FfiConverterOptionTypeAssetType.lower(assetType),
3822-
FfiConverterOptionString.lower(txnId),$0
3816+
FfiConverterOptionTypeAssetType.lower(assetType),$0
38233817
)
38243818
}
38253819
}
38263820

3827-
public func sendPollResponse(pollStartId: String, answers: [String], txnId: String?) throws {
3821+
public func sendPollResponse(pollStartId: String, answers: [String]) throws {
38283822
try
38293823
rustCallWithError(FfiConverterTypeClientError.lift) {
38303824
uniffi_matrix_sdk_ffi_fn_method_room_send_poll_response(self.pointer,
38313825
FfiConverterString.lower(pollStartId),
3832-
FfiConverterSequenceString.lower(answers),
3833-
FfiConverterOptionString.lower(txnId),$0
3826+
FfiConverterSequenceString.lower(answers),$0
38343827
)
38353828
}
38363829
}
@@ -3854,13 +3847,12 @@ public class Room: RoomProtocol {
38543847
}
38553848
}
38563849

3857-
public func sendReply(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem, txnId: String?) throws {
3850+
public func sendReply(msg: RoomMessageEventContentWithoutRelation, replyItem: EventTimelineItem) throws {
38583851
try
38593852
rustCallWithError(FfiConverterTypeClientError.lift) {
38603853
uniffi_matrix_sdk_ffi_fn_method_room_send_reply(self.pointer,
38613854
FfiConverterTypeRoomMessageEventContentWithoutRelation.lower(msg),
3862-
FfiConverterTypeEventTimelineItem.lower(replyItem),
3863-
FfiConverterOptionString.lower(txnId),$0
3855+
FfiConverterTypeEventTimelineItem.lower(replyItem),$0
38643856
)
38653857
}
38663858
}
@@ -10675,6 +10667,7 @@ public enum MessageLikeEventContent {
1067510667
case keyVerificationKey
1067610668
case keyVerificationMac
1067710669
case keyVerificationDone
10670+
case poll(question: String)
1067810671
case reactionContent(relatedEventId: String)
1067910672
case roomEncrypted
1068010673
case roomMessage(messageType: MessageType, inReplyToEventId: String?)
@@ -10711,20 +10704,24 @@ public struct FfiConverterTypeMessageLikeEventContent: FfiConverterRustBuffer {
1071110704

1071210705
case 11: return .keyVerificationDone
1071310706

10714-
case 12: return .reactionContent(
10707+
case 12: return .poll(
10708+
question: try FfiConverterString.read(from: &buf)
10709+
)
10710+
10711+
case 13: return .reactionContent(
1071510712
relatedEventId: try FfiConverterString.read(from: &buf)
1071610713
)
1071710714

10718-
case 13: return .roomEncrypted
10715+
case 14: return .roomEncrypted
1071910716

10720-
case 14: return .roomMessage(
10717+
case 15: return .roomMessage(
1072110718
messageType: try FfiConverterTypeMessageType.read(from: &buf),
1072210719
inReplyToEventId: try FfiConverterOptionString.read(from: &buf)
1072310720
)
1072410721

10725-
case 15: return .roomRedaction
10722+
case 16: return .roomRedaction
1072610723

10727-
case 16: return .sticker
10724+
case 17: return .sticker
1072810725

1072910726
default: throw UniffiInternalError.unexpectedEnumCase
1073010727
}
@@ -10778,27 +10775,32 @@ public struct FfiConverterTypeMessageLikeEventContent: FfiConverterRustBuffer {
1077810775
writeInt(&buf, Int32(11))
1077910776

1078010777

10781-
case let .reactionContent(relatedEventId):
10778+
case let .poll(question):
1078210779
writeInt(&buf, Int32(12))
10780+
FfiConverterString.write(question, into: &buf)
10781+
10782+
10783+
case let .reactionContent(relatedEventId):
10784+
writeInt(&buf, Int32(13))
1078310785
FfiConverterString.write(relatedEventId, into: &buf)
1078410786

1078510787

1078610788
case .roomEncrypted:
10787-
writeInt(&buf, Int32(13))
10789+
writeInt(&buf, Int32(14))
1078810790

1078910791

1079010792
case let .roomMessage(messageType,inReplyToEventId):
10791-
writeInt(&buf, Int32(14))
10793+
writeInt(&buf, Int32(15))
1079210794
FfiConverterTypeMessageType.write(messageType, into: &buf)
1079310795
FfiConverterOptionString.write(inReplyToEventId, into: &buf)
1079410796

1079510797

1079610798
case .roomRedaction:
10797-
writeInt(&buf, Int32(15))
10799+
writeInt(&buf, Int32(16))
1079810800

1079910801

1080010802
case .sticker:
10801-
writeInt(&buf, Int32(16))
10803+
writeInt(&buf, Int32(17))
1080210804

1080310805
}
1080410806
}
@@ -18839,16 +18841,16 @@ private var initializationResult: InitializationResult {
1883918841
if (uniffi_matrix_sdk_ffi_checksum_method_room_canonical_alias() != 15084) {
1884018842
return InitializationResult.apiChecksumMismatch
1884118843
}
18842-
if (uniffi_matrix_sdk_ffi_checksum_method_room_create_poll() != 5532) {
18844+
if (uniffi_matrix_sdk_ffi_checksum_method_room_create_poll() != 62592) {
1884318845
return InitializationResult.apiChecksumMismatch
1884418846
}
1884518847
if (uniffi_matrix_sdk_ffi_checksum_method_room_display_name() != 38216) {
1884618848
return InitializationResult.apiChecksumMismatch
1884718849
}
18848-
if (uniffi_matrix_sdk_ffi_checksum_method_room_edit() != 35232) {
18850+
if (uniffi_matrix_sdk_ffi_checksum_method_room_edit() != 38490) {
1884918851
return InitializationResult.apiChecksumMismatch
1885018852
}
18851-
if (uniffi_matrix_sdk_ffi_checksum_method_room_end_poll() != 8937) {
18853+
if (uniffi_matrix_sdk_ffi_checksum_method_room_end_poll() != 42646) {
1885218854
return InitializationResult.apiChecksumMismatch
1885318855
}
1885418856
if (uniffi_matrix_sdk_ffi_checksum_method_room_fetch_details_for_event() != 23233) {
@@ -18935,7 +18937,7 @@ private var initializationResult: InitializationResult {
1893518937
if (uniffi_matrix_sdk_ffi_checksum_method_room_paginate_backwards() != 28035) {
1893618938
return InitializationResult.apiChecksumMismatch
1893718939
}
18938-
if (uniffi_matrix_sdk_ffi_checksum_method_room_redact() != 61747) {
18940+
if (uniffi_matrix_sdk_ffi_checksum_method_room_redact() != 12809) {
1893918941
return InitializationResult.apiChecksumMismatch
1894018942
}
1894118943
if (uniffi_matrix_sdk_ffi_checksum_method_room_remove_avatar() != 24698) {
@@ -18959,7 +18961,7 @@ private var initializationResult: InitializationResult {
1895918961
if (uniffi_matrix_sdk_ffi_checksum_method_room_room_info_blocking() != 23031) {
1896018962
return InitializationResult.apiChecksumMismatch
1896118963
}
18962-
if (uniffi_matrix_sdk_ffi_checksum_method_room_send() != 39033) {
18964+
if (uniffi_matrix_sdk_ffi_checksum_method_room_send() != 974) {
1896318965
return InitializationResult.apiChecksumMismatch
1896418966
}
1896518967
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_audio() != 19498) {
@@ -18971,10 +18973,10 @@ private var initializationResult: InitializationResult {
1897118973
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_image() != 56510) {
1897218974
return InitializationResult.apiChecksumMismatch
1897318975
}
18974-
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_location() != 43614) {
18976+
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_location() != 25452) {
1897518977
return InitializationResult.apiChecksumMismatch
1897618978
}
18977-
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_poll_response() != 1386) {
18979+
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_poll_response() != 21289) {
1897818980
return InitializationResult.apiChecksumMismatch
1897918981
}
1898018982
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_read_marker() != 53306) {
@@ -18983,7 +18985,7 @@ private var initializationResult: InitializationResult {
1898318985
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_read_receipt() != 6919) {
1898418986
return InitializationResult.apiChecksumMismatch
1898518987
}
18986-
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_reply() != 45489) {
18988+
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_reply() != 12091) {
1898718989
return InitializationResult.apiChecksumMismatch
1898818990
}
1898918991
if (uniffi_matrix_sdk_ffi_checksum_method_room_send_video() != 38775) {

0 commit comments

Comments
 (0)