From 8f800e54a3707a0777db3aa73196461a791d4931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Wed, 13 May 2026 15:19:53 +0200 Subject: [PATCH 1/2] Bump Crypto SDK dependency to `v26.05.12` --- matrix-sdk-android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index f8fbdd67bf1..73c39a209a4 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -221,7 +221,7 @@ dependencies { implementation libs.google.phonenumber - implementation("org.matrix.rustcomponents:crypto-android:26.1.28") + implementation("org.matrix.rustcomponents:crypto-android:26.05.12") // api project(":library:rustCrypto") testImplementation libs.tests.junit From aaa624ae423b2f903fae34a7a75a8a12b2ba5f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Wed, 13 May 2026 15:20:08 +0200 Subject: [PATCH 2/2] Fix API breaks --- .../session/contentscanner/ScanEncryptorUtils.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt index 9cf8c90d127..fc19ad77f04 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtils.kt @@ -43,12 +43,12 @@ internal object ScanEncryptorUtils { ), v = "v2" ) - return if (publicServerKey != null) { + return publicServerKey?.let { serverKey -> // Note: fromBase64 can throw Exception - val pkEncryption = PkEncryption.fromBase64(key = publicServerKey) + val pkEncryption = PkEncryption.fromBase64(key = serverKey) val pkMessage = pkEncryption.use { pkEncryption.encrypt(DownloadBody(encryptedInfo).toCanonicalJson()) - } + } ?: error("Encryption failed, the keys used for encryption are not valid") DownloadBody( encryptedBody = EncryptedBody( cipherText = pkMessage.ciphertext, @@ -56,8 +56,6 @@ internal object ScanEncryptorUtils { mac = pkMessage.mac ) ) - } else { - DownloadBody(encryptedInfo) - } + } ?: DownloadBody(encryptedInfo) } }