Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #1101 from vector-im/feature/bma/fixGoogleCryptoCrash

Browse source 
Use alpha version of the library `androidx.security:security-crypto`
This commit is contained in:
Benoit Marty 2023-08-21 16:10:45 +02:00 • committed by GitHub
commit 059f93cac7
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/1101.bugfix Normal file
View file

@ -0,0 +1 @@
Fix crash RuntimeException "No matching key found for the ciphertext in the stream"

2
gradle/libs.versions.toml
View file

@ -82,7 +82,7 @@ androidx_browser = { module = "androidx.browser:browser", version.ref = "browser
androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
androidx_lifecycle_process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" } androidx_lifecycle_process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
androidx_splash = "androidx.core:core-splashscreen:1.0.1" androidx_splash = "androidx.core:core-splashscreen:1.0.1"
androidx_security_crypto = "androidx.security:security-crypto:1.0.0" androidx_security_crypto = "androidx.security:security-crypto:1.1.0-alpha06"
androidx_media3_exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" } androidx_media3_exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
androidx_media3_ui = { module = "androidx.media3:media3-ui", version.ref = "media3" } androidx_media3_ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }

10
libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/EncryptedFileFactory.kt
View file

@ -18,7 +18,7 @@ package io.element.android.libraries.androidutils.file
import android.content.Context import android.content.Context
import androidx.security.crypto.EncryptedFile import androidx.security.crypto.EncryptedFile
import androidx.security.crypto.MasterKeys import androidx.security.crypto.MasterKey
import java.io.File import java.io.File
class EncryptedFileFactory( class EncryptedFileFactory(
@ -26,11 +26,13 @@ class EncryptedFileFactory(
) { ) {
fun create(file: File): EncryptedFile { fun create(file: File): EncryptedFile {
// We need to use the same key for all the encrypted files. // We need to use the same key for all the encrypted files.
val masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC) val masterKey = MasterKey.Builder(context)
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
.build()
return EncryptedFile.Builder( return EncryptedFile.Builder(
file,
context, context,
masterKeyAlias, file,
masterKey,
EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB
).build() ).build()
} }