WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 4ca680f

Browse files
author
github-actions
committed
Bump SDK version to 25.11.24 (matrix-rust-sdk to 2f7d2b3b9b1ea641f53eb1e2c2f03c6c7fb27371)
1 parent b5a87df commit 4ca680f

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
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 = 11
4-
const val patchVersion = 19
4+
const val patchVersion = 24
55
}

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

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,11 +2771,11 @@ internal object UniffiLib {
27712771
uniffiCallbackInterfaceUnableToDecryptDelegate.register(this)
27722772
uniffiCallbackInterfaceVerificationStateListener.register(this)
27732773
uniffiCallbackInterfaceWidgetCapabilitiesProvider.register(this)
2774-
uniffi.matrix_sdk_ui.uniffiEnsureInitialized()
27752774
uniffi.matrix_sdk.uniffiEnsureInitialized()
2776-
uniffi.matrix_sdk_base.uniffiEnsureInitialized()
27772775
uniffi.matrix_sdk_crypto.uniffiEnsureInitialized()
2776+
uniffi.matrix_sdk_ui.uniffiEnsureInitialized()
27782777
uniffi.matrix_sdk_common.uniffiEnsureInitialized()
2778+
uniffi.matrix_sdk_base.uniffiEnsureInitialized()
27792779

27802780
}
27812781
external fun uniffi_matrix_sdk_ffi_fn_clone_checkcodesender(`handle`: Long,uniffi_out_err: UniffiRustCallStatus,
@@ -3068,7 +3068,7 @@ external fun uniffi_matrix_sdk_ffi_fn_method_encryption_reset_identity(`ptr`: Lo
30683068
): Long
30693069
external fun uniffi_matrix_sdk_ffi_fn_method_encryption_reset_recovery_key(`ptr`: Long,
30703070
): Long
3071-
external fun uniffi_matrix_sdk_ffi_fn_method_encryption_user_identity(`ptr`: Long,`userId`: RustBuffer.ByValue,
3071+
external fun uniffi_matrix_sdk_ffi_fn_method_encryption_user_identity(`ptr`: Long,`userId`: RustBuffer.ByValue,`fallbackToServer`: Byte,
30723072
): Long
30733073
external fun uniffi_matrix_sdk_ffi_fn_method_encryption_verification_state(`ptr`: Long,uniffi_out_err: UniffiRustCallStatus,
30743074
): RustBuffer.ByValue
@@ -4609,7 +4609,7 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
46094609
if (lib.uniffi_matrix_sdk_ffi_checksum_method_encryption_reset_recovery_key() != 20380.toShort()) {
46104610
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
46114611
}
4612-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_encryption_user_identity() != 20644.toShort()) {
4612+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_encryption_user_identity() != 17575.toShort()) {
46134613
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
46144614
}
46154615
if (lib.uniffi_matrix_sdk_ffi_checksum_method_encryption_verification_state() != 29114.toShort()) {
@@ -10456,19 +10456,21 @@ public interface EncryptionInterface {
1045610456
* This method always tries to fetch the identity from the store, which we
1045710457
* only have if the user is tracked, meaning that we are both members
1045810458
* of the same encrypted room. If no user is found locally, a request will
10459-
* be made to the homeserver.
10459+
* be made to the homeserver unless `fallback_to_server` is set to `false`.
1046010460
*
1046110461
* # Arguments
1046210462
*
1046310463
* * `user_id` - The ID of the user that the identity belongs to.
10464+
* * `fallback_to_server` - Should we request the user identity from the
10465+
* homeserver if one isn't found locally.
1046410466
*
1046510467
* Returns a `UserIdentity` if one is found. Returns an error if there
1046610468
* was an issue with the crypto store or with the request to the
1046710469
* homeserver.
1046810470
*
1046910471
* This will always return `None` if the client hasn't been logged in.
1047010472
*/
10471-
suspend fun `userIdentity`(`userId`: kotlin.String): UserIdentity?
10473+
suspend fun `userIdentity`(`userId`: kotlin.String, `fallbackToServer`: kotlin.Boolean): UserIdentity?
1047210474

1047310475
fun `verificationState`(): VerificationState
1047410476

@@ -10923,11 +10925,13 @@ open class Encryption: Disposable, AutoCloseable, EncryptionInterface
1092310925
* This method always tries to fetch the identity from the store, which we
1092410926
* only have if the user is tracked, meaning that we are both members
1092510927
* of the same encrypted room. If no user is found locally, a request will
10926-
* be made to the homeserver.
10928+
* be made to the homeserver unless `fallback_to_server` is set to `false`.
1092710929
*
1092810930
* # Arguments
1092910931
*
1093010932
* * `user_id` - The ID of the user that the identity belongs to.
10933+
* * `fallback_to_server` - Should we request the user identity from the
10934+
* homeserver if one isn't found locally.
1093110935
*
1093210936
* Returns a `UserIdentity` if one is found. Returns an error if there
1093310937
* was an issue with the crypto store or with the request to the
@@ -10937,12 +10941,12 @@ open class Encryption: Disposable, AutoCloseable, EncryptionInterface
1093710941
*/
1093810942
@Throws(ClientException::class)
1093910943
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
10940-
override suspend fun `userIdentity`(`userId`: kotlin.String) : UserIdentity? {
10944+
override suspend fun `userIdentity`(`userId`: kotlin.String, `fallbackToServer`: kotlin.Boolean) : UserIdentity? {
1094110945
return uniffiRustCallAsync(
1094210946
callWithHandle { uniffiHandle ->
1094310947
UniffiLib.uniffi_matrix_sdk_ffi_fn_method_encryption_user_identity(
1094410948
uniffiHandle,
10945-
FfiConverterString.lower(`userId`),
10949+
FfiConverterString.lower(`userId`),FfiConverterBoolean.lower(`fallbackToServer`),
1094610950
)
1094710951
},
1094810952
{ future, callback, continuation -> UniffiLib.ffi_matrix_sdk_ffi_rust_future_poll_rust_buffer(future, callback, continuation) },
@@ -41236,6 +41240,8 @@ sealed class LatestEventValue: Disposable {
4123641240

4123741241
data class Local(
4123841242
val `timestamp`: Timestamp,
41243+
val `sender`: kotlin.String,
41244+
val `profile`: ProfileDetails,
4123941245
val `content`: TimelineItemContent,
4124041246
val `isSending`: kotlin.Boolean) : LatestEventValue()
4124141247

@@ -41267,6 +41273,8 @@ sealed class LatestEventValue: Disposable {
4126741273

4126841274
Disposable.destroy(
4126941275
this.`timestamp`,
41276+
this.`sender`,
41277+
this.`profile`,
4127041278
this.`content`,
4127141279
this.`isSending`
4127241280
)
@@ -41294,6 +41302,8 @@ public object FfiConverterTypeLatestEventValue : FfiConverterRustBuffer<LatestEv
4129441302
)
4129541303
3 -> LatestEventValue.Local(
4129641304
FfiConverterTypeTimestamp.read(buf),
41305+
FfiConverterString.read(buf),
41306+
FfiConverterTypeProfileDetails.read(buf),
4129741307
FfiConverterTypeTimelineItemContent.read(buf),
4129841308
FfiConverterBoolean.read(buf),
4129941309
)
@@ -41324,6 +41334,8 @@ public object FfiConverterTypeLatestEventValue : FfiConverterRustBuffer<LatestEv
4132441334
(
4132541335
4UL
4132641336
+ FfiConverterTypeTimestamp.allocationSize(value.`timestamp`)
41337+
+ FfiConverterString.allocationSize(value.`sender`)
41338+
+ FfiConverterTypeProfileDetails.allocationSize(value.`profile`)
4132741339
+ FfiConverterTypeTimelineItemContent.allocationSize(value.`content`)
4132841340
+ FfiConverterBoolean.allocationSize(value.`isSending`)
4132941341
)
@@ -41348,6 +41360,8 @@ public object FfiConverterTypeLatestEventValue : FfiConverterRustBuffer<LatestEv
4134841360
is LatestEventValue.Local -> {
4134941361
buf.putInt(3)
4135041362
FfiConverterTypeTimestamp.write(value.`timestamp`, buf)
41363+
FfiConverterString.write(value.`sender`, buf)
41364+
FfiConverterTypeProfileDetails.write(value.`profile`, buf)
4135141365
FfiConverterTypeTimelineItemContent.write(value.`content`, buf)
4135241366
FfiConverterBoolean.write(value.`isSending`, buf)
4135341367
Unit

0 commit comments

Comments
 (0)