Skip to content

Commit ef1d63a

Browse files
author
github-actions
committed
Bump SDK version to 25.06.18 (matrix-rust-sdk to f4e612ca9e47501c6af5e67a562c1d85553c9aac)
1 parent b6ce4b7 commit ef1d63a

File tree

3 files changed

+52
-23
lines changed

3 files changed

+52
-23
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object BuildVersionsSDK {
22
const val majorVersion = 25
33
const val minorVersion = 6
4-
const val patchVersion = 10
4+
const val patchVersion = 18
55
}

sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,6 +2377,8 @@ internal open class UniffiVTableCallbackInterfaceWidgetCapabilitiesProvider(
23772377

23782378

23792379

2380+
2381+
23802382

23812383

23822384

@@ -2888,7 +2890,7 @@ internal interface UniffiLib : Library {
28882890
): Long
28892891
fun uniffi_matrix_sdk_ffi_fn_method_room_canonical_alias(`ptr`: Pointer,uniffi_out_err: UniffiRustCallStatus,
28902892
): RustBuffer.ByValue
2891-
fun uniffi_matrix_sdk_ffi_fn_method_room_clear_composer_draft(`ptr`: Pointer,
2893+
fun uniffi_matrix_sdk_ffi_fn_method_room_clear_composer_draft(`ptr`: Pointer,`threadRoot`: RustBuffer.ByValue,
28922894
): Long
28932895
fun uniffi_matrix_sdk_ffi_fn_method_room_clear_event_cache_storage(`ptr`: Pointer,
28942896
): Long
@@ -2948,7 +2950,7 @@ internal interface UniffiLib : Library {
29482950
): Long
29492951
fun uniffi_matrix_sdk_ffi_fn_method_room_leave(`ptr`: Pointer,
29502952
): Long
2951-
fun uniffi_matrix_sdk_ffi_fn_method_room_load_composer_draft(`ptr`: Pointer,
2953+
fun uniffi_matrix_sdk_ffi_fn_method_room_load_composer_draft(`ptr`: Pointer,`threadRoot`: RustBuffer.ByValue,
29522954
): Long
29532955
fun uniffi_matrix_sdk_ffi_fn_method_room_mark_as_read(`ptr`: Pointer,`receiptType`: RustBuffer.ByValue,
29542956
): Long
@@ -2996,7 +2998,7 @@ internal interface UniffiLib : Library {
29962998
): Long
29972999
fun uniffi_matrix_sdk_ffi_fn_method_room_room_info(`ptr`: Pointer,
29983000
): Long
2999-
fun uniffi_matrix_sdk_ffi_fn_method_room_save_composer_draft(`ptr`: Pointer,`draft`: RustBuffer.ByValue,
3001+
fun uniffi_matrix_sdk_ffi_fn_method_room_save_composer_draft(`ptr`: Pointer,`draft`: RustBuffer.ByValue,`threadRoot`: RustBuffer.ByValue,
30003002
): Long
30013003
fun uniffi_matrix_sdk_ffi_fn_method_room_send_call_notification(`ptr`: Pointer,`callId`: RustBuffer.ByValue,`application`: RustBuffer.ByValue,`notifyType`: RustBuffer.ByValue,`mentions`: RustBuffer.ByValue,
30023004
): Long
@@ -3248,6 +3250,8 @@ internal interface UniffiLib : Library {
32483250
): Unit
32493251
fun uniffi_matrix_sdk_ffi_fn_method_threadsummary_latest_event(`ptr`: Pointer,uniffi_out_err: UniffiRustCallStatus,
32503252
): RustBuffer.ByValue
3253+
fun uniffi_matrix_sdk_ffi_fn_method_threadsummary_num_replies(`ptr`: Pointer,uniffi_out_err: UniffiRustCallStatus,
3254+
): Long
32513255
fun uniffi_matrix_sdk_ffi_fn_clone_timeline(`ptr`: Pointer,uniffi_out_err: UniffiRustCallStatus,
32523256
): Pointer
32533257
fun uniffi_matrix_sdk_ffi_fn_free_timeline(`ptr`: Pointer,uniffi_out_err: UniffiRustCallStatus,
@@ -3292,7 +3296,7 @@ internal interface UniffiLib : Library {
32923296
): Pointer
32933297
fun uniffi_matrix_sdk_ffi_fn_method_timeline_send_image(`ptr`: Pointer,`params`: RustBuffer.ByValue,`thumbnailPath`: RustBuffer.ByValue,`imageInfo`: RustBuffer.ByValue,`progressWatcher`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus,
32943298
): Pointer
3295-
fun uniffi_matrix_sdk_ffi_fn_method_timeline_send_location(`ptr`: Pointer,`body`: RustBuffer.ByValue,`geoUri`: RustBuffer.ByValue,`description`: RustBuffer.ByValue,`zoomLevel`: RustBuffer.ByValue,`assetType`: RustBuffer.ByValue,
3299+
fun uniffi_matrix_sdk_ffi_fn_method_timeline_send_location(`ptr`: Pointer,`body`: RustBuffer.ByValue,`geoUri`: RustBuffer.ByValue,`description`: RustBuffer.ByValue,`zoomLevel`: RustBuffer.ByValue,`assetType`: RustBuffer.ByValue,`replyParams`: RustBuffer.ByValue,
32963300
): Long
32973301
fun uniffi_matrix_sdk_ffi_fn_method_timeline_send_poll_response(`ptr`: Pointer,`pollStartEventId`: RustBuffer.ByValue,`answers`: RustBuffer.ByValue,
32983302
): Long
@@ -4348,6 +4352,8 @@ internal interface UniffiLib : Library {
43484352
): Short
43494353
fun uniffi_matrix_sdk_ffi_checksum_method_threadsummary_latest_event(
43504354
): Short
4355+
fun uniffi_matrix_sdk_ffi_checksum_method_threadsummary_num_replies(
4356+
): Short
43514357
fun uniffi_matrix_sdk_ffi_checksum_method_timeline_add_listener(
43524358
): Short
43534359
fun uniffi_matrix_sdk_ffi_checksum_method_timeline_create_message_content(
@@ -5230,7 +5236,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
52305236
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_canonical_alias() != 19786.toShort()) {
52315237
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
52325238
}
5233-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_clear_composer_draft() != 39667.toShort()) {
5239+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_clear_composer_draft() != 59182.toShort()) {
52345240
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
52355241
}
52365242
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_clear_event_cache_storage() != 13838.toShort()) {
@@ -5320,7 +5326,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
53205326
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_leave() != 63688.toShort()) {
53215327
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
53225328
}
5323-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_load_composer_draft() != 38115.toShort()) {
5329+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_load_composer_draft() != 62856.toShort()) {
53245330
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
53255331
}
53265332
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_mark_as_read() != 57806.toShort()) {
@@ -5392,7 +5398,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
53925398
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_room_info() != 41146.toShort()) {
53935399
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
53945400
}
5395-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_save_composer_draft() != 62232.toShort()) {
5401+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_save_composer_draft() != 27585.toShort()) {
53965402
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
53975403
}
53985404
if (lib.uniffi_matrix_sdk_ffi_checksum_method_room_send_call_notification() != 43366.toShort()) {
@@ -5656,6 +5662,9 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
56565662
if (lib.uniffi_matrix_sdk_ffi_checksum_method_threadsummary_latest_event() != 52917.toShort()) {
56575663
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
56585664
}
5665+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_threadsummary_num_replies() != 10634.toShort()) {
5666+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
5667+
}
56595668
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_add_listener() != 18746.toShort()) {
56605669
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
56615670
}
@@ -5716,7 +5725,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
57165725
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_send_image() != 25436.toShort()) {
57175726
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
57185727
}
5719-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_send_location() != 47400.toShort()) {
5728+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_send_location() != 57832.toShort()) {
57205729
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
57215730
}
57225731
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_send_poll_response() != 7453.toShort()) {
@@ -14186,7 +14195,7 @@ public interface RoomInterface {
1418614195
/**
1418714196
* Remove the `ComposerDraft` stored in the state store for this room.
1418814197
*/
14189-
suspend fun `clearComposerDraft`()
14198+
suspend fun `clearComposerDraft`(`threadRoot`: kotlin.String?)
1419014199

1419114200
/**
1419214201
* Clear the event cache storage for the current room.
@@ -14343,7 +14352,7 @@ public interface RoomInterface {
1434314352
/**
1434414353
* Retrieve the `ComposerDraft` stored in the state store for this room.
1434514354
*/
14346-
suspend fun `loadComposerDraft`(): ComposerDraft?
14355+
suspend fun `loadComposerDraft`(`threadRoot`: kotlin.String?): ComposerDraft?
1434714356

1434814357
/**
1434914358
* Mark a room as read, by attaching a read receipt on the latest event.
@@ -14492,7 +14501,7 @@ public interface RoomInterface {
1449214501
* Store the given `ComposerDraft` in the state store using the current
1449314502
* room id, as identifier.
1449414503
*/
14495-
suspend fun `saveComposerDraft`(`draft`: ComposerDraft)
14504+
suspend fun `saveComposerDraft`(`draft`: ComposerDraft, `threadRoot`: kotlin.String?)
1449614505

1449714506
/**
1449814507
* Send a call notification event in the current room.
@@ -15076,12 +15085,12 @@ open class Room: Disposable, AutoCloseable, RoomInterface {
1507615085
*/
1507715086
@Throws(ClientException::class)
1507815087
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
15079-
override suspend fun `clearComposerDraft`() {
15088+
override suspend fun `clearComposerDraft`(`threadRoot`: kotlin.String?) {
1508015089
return uniffiRustCallAsync(
1508115090
callWithPointer { thisPtr ->
1508215091
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_room_clear_composer_draft(
1508315092
thisPtr,
15084-
15093+
FfiConverterOptionalString.lower(`threadRoot`),
1508515094
)
1508615095
},
1508715096
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_matrix_sdk_ffi_rust_future_poll_void(future, callback, continuation) },
@@ -15712,12 +15721,12 @@ open class Room: Disposable, AutoCloseable, RoomInterface {
1571215721
*/
1571315722
@Throws(ClientException::class)
1571415723
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
15715-
override suspend fun `loadComposerDraft`() : ComposerDraft? {
15724+
override suspend fun `loadComposerDraft`(`threadRoot`: kotlin.String?) : ComposerDraft? {
1571615725
return uniffiRustCallAsync(
1571715726
callWithPointer { thisPtr ->
1571815727
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_room_load_composer_draft(
1571915728
thisPtr,
15720-
15729+
FfiConverterOptionalString.lower(`threadRoot`),
1572115730
)
1572215731
},
1572315732
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_matrix_sdk_ffi_rust_future_poll_rust_buffer(future, callback, continuation) },
@@ -16286,12 +16295,12 @@ open class Room: Disposable, AutoCloseable, RoomInterface {
1628616295
*/
1628716296
@Throws(ClientException::class)
1628816297
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
16289-
override suspend fun `saveComposerDraft`(`draft`: ComposerDraft) {
16298+
override suspend fun `saveComposerDraft`(`draft`: ComposerDraft, `threadRoot`: kotlin.String?) {
1629016299
return uniffiRustCallAsync(
1629116300
callWithPointer { thisPtr ->
1629216301
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_room_save_composer_draft(
1629316302
thisPtr,
16294-
FfiConverterTypeComposerDraft.lower(`draft`),
16303+
FfiConverterTypeComposerDraft.lower(`draft`),FfiConverterOptionalString.lower(`threadRoot`),
1629516304
)
1629616305
},
1629716306
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_matrix_sdk_ffi_rust_future_poll_void(future, callback, continuation) },
@@ -22495,6 +22504,8 @@ public interface ThreadSummaryInterface {
2249522504

2249622505
fun `latestEvent`(): EmbeddedEventDetails
2249722506

22507+
fun `numReplies`(): kotlin.ULong
22508+
2249822509
companion object
2249922510
}
2250022511

@@ -22591,6 +22602,18 @@ open class ThreadSummary: Disposable, AutoCloseable, ThreadSummaryInterface {
2259122602
}
2259222603

2259322604

22605+
override fun `numReplies`(): kotlin.ULong {
22606+
return FfiConverterULong.lift(
22607+
callWithPointer {
22608+
uniffiRustCall() { _status ->
22609+
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_threadsummary_num_replies(
22610+
it, _status)
22611+
}
22612+
}
22613+
)
22614+
}
22615+
22616+
2259422617

2259522618

2259622619

@@ -22834,7 +22857,7 @@ public interface TimelineInterface {
2283422857

2283522858
fun `sendImage`(`params`: UploadParameters, `thumbnailPath`: kotlin.String?, `imageInfo`: ImageInfo, `progressWatcher`: ProgressWatcher?): SendAttachmentJoinHandle
2283622859

22837-
suspend fun `sendLocation`(`body`: kotlin.String, `geoUri`: kotlin.String, `description`: kotlin.String?, `zoomLevel`: kotlin.UByte?, `assetType`: AssetType?)
22860+
suspend fun `sendLocation`(`body`: kotlin.String, `geoUri`: kotlin.String, `description`: kotlin.String?, `zoomLevel`: kotlin.UByte?, `assetType`: AssetType?, `replyParams`: ReplyParameters?)
2283822861

2283922862
suspend fun `sendPollResponse`(`pollStartEventId`: kotlin.String, `answers`: List<kotlin.String>)
2284022863

@@ -23407,13 +23430,14 @@ open class Timeline: Disposable, AutoCloseable, TimelineInterface {
2340723430

2340823431

2340923432

23433+
@Throws(ClientException::class)
2341023434
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
23411-
override suspend fun `sendLocation`(`body`: kotlin.String, `geoUri`: kotlin.String, `description`: kotlin.String?, `zoomLevel`: kotlin.UByte?, `assetType`: AssetType?) {
23435+
override suspend fun `sendLocation`(`body`: kotlin.String, `geoUri`: kotlin.String, `description`: kotlin.String?, `zoomLevel`: kotlin.UByte?, `assetType`: AssetType?, `replyParams`: ReplyParameters?) {
2341223436
return uniffiRustCallAsync(
2341323437
callWithPointer { thisPtr ->
2341423438
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_timeline_send_location(
2341523439
thisPtr,
23416-
FfiConverterString.lower(`body`),FfiConverterString.lower(`geoUri`),FfiConverterOptionalString.lower(`description`),FfiConverterOptionalUByte.lower(`zoomLevel`),FfiConverterOptionalTypeAssetType.lower(`assetType`),
23440+
FfiConverterString.lower(`body`),FfiConverterString.lower(`geoUri`),FfiConverterOptionalString.lower(`description`),FfiConverterOptionalUByte.lower(`zoomLevel`),FfiConverterOptionalTypeAssetType.lower(`assetType`),FfiConverterOptionalTypeReplyParameters.lower(`replyParams`),
2341723441
)
2341823442
},
2341923443
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_matrix_sdk_ffi_rust_future_poll_void(future, callback, continuation) },
@@ -23423,7 +23447,7 @@ open class Timeline: Disposable, AutoCloseable, TimelineInterface {
2342323447
{ Unit },
2342423448

2342523449
// Error FFI converter
23426-
UniffiNullRustCallStatusErrorHandler,
23450+
ClientException.ErrorHandler,
2342723451
)
2342823452
}
2342923453

sdk/sdk-android/src/main/kotlin/uniffi/matrix_sdk_common/matrix_sdk_common.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,12 @@ enum class ShieldStateCode {
959959
/**
960960
* The sender was previously verified but changed their identity.
961961
*/
962-
VERIFICATION_VIOLATION;
962+
VERIFICATION_VIOLATION,
963+
/**
964+
* The `sender` field on the event does not match the owner of the device
965+
* that established the Megolm session.
966+
*/
967+
MISMATCHED_SENDER;
963968
companion object
964969
}
965970

0 commit comments

Comments
 (0)