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

Ignore secrets when the bundle does not contain the room keys version.

Browse source
This commit is contained in:
Benoit Marty 2026-04-13 11:15:42 +02:00 • committed by Benoit Marty
parent ff72bbb058
commit 7a10ce9e54
2 changed files with 86 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/classic/ElementClassicConnection.kt
View file

@ -319,8 +319,16 @@ class DefaultElementClassicConnection(
if (userId == null) {
ElementClassicConnectionState.ElementClassicReadyNoSession
} else {
val secrets = getString(KEY_SECRETS_STR)?.takeIf { it.isNotEmpty() }
val roomKeysVersion = getString(KEY_ROOM_KEYS_VERSION_STR)?.takeIf { it.isNotEmpty() }
var secrets = getString(KEY_SECRETS_STR)?.takeIf { it.isNotEmpty() }
val roomKeysVersion = getString(KEY_ROOM_KEYS_VERSION_STR)
.also {
if (secrets != null && it == null) {
Timber.tag(loggerTag.value).w("Room keys version is null, outdated version of Element Classic, ignore secrets")
// In this case, just ignore the secrets, the SDK will not accept them anyway
secrets = null
}
}
?.takeIf { it.isNotEmpty() }
val homeserverUrl = getString(KEY_HOMESERVER_URL_STR)?.takeIf { it.isNotEmpty() }
val displayName = getString(KEY_USER_DISPLAY_NAME_STR)?.takeIf { it.isNotEmpty() }
val doesContainBackupKey = secrets != null &&