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

Fix crash when creating an EncryptedFile in Android 6 (#2853)

Browse source
This commit is contained in:
Jorge Martin Espinosa 2024-05-15 18:10:16 +02:00 • committed by GitHub
parent d103872f42
commit 822705195f
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix a crash when trying to create an `EncryptedFile` in Android 6.

7
libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/di/SessionStorageModule.kt
View file

@ -35,6 +35,13 @@ object SessionStorageModule {
fun provideMatrixDatabase(@ApplicationContext context: Context): SessionDatabase { fun provideMatrixDatabase(@ApplicationContext context: Context): SessionDatabase {
val name = "session_database" val name = "session_database"
val secretFile = context.getDatabasePath("$name.key") val secretFile = context.getDatabasePath("$name.key")
// Make sure the parent directory of the key file exists, otherwise it will crash in older Android versions
val parentDir = secretFile.parentFile
if (parentDir != null && !parentDir.exists()) {
parentDir.mkdirs()
}
val passphraseProvider = RandomSecretPassphraseProvider(context, secretFile) val passphraseProvider = RandomSecretPassphraseProvider(context, secretFile)
val driver = SqlCipherDriverFactory(passphraseProvider) val driver = SqlCipherDriverFactory(passphraseProvider)
.create(SessionDatabase.Schema, "$name.db", context) .create(SessionDatabase.Schema, "$name.db", context)