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

Fix deprecated API usage.

Browse source
This commit is contained in:
Benoit Marty 2023-08-21 14:33:47 +02:00
parent 50689d59d5
commit 035a3da417
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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()
} }