filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3804 from vector-im/feature/ons/fix_deleting_user_device

Browse Source 
Fix error when sending encrypted message if someone in the room logs out
This commit is contained in:
Onuray Sahin 2021-08-06 16:13:02 +03:00 committed by GitHub
commit 60a210194d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3792.bugfix Normal file
View File

@ -0,0 +1 @@
Fix error when sending encrypted message if someone in the room logs out.

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
View File

@ -286,12 +286,15 @@ internal class RealmCryptoStore @Inject constructor(
val userEntity = UserEntity.getOrCreate(realm, userId) val userEntity = UserEntity.getOrCreate(realm, userId)
// First delete the removed devices // First delete the removed devices
val deviceIds = devices.keys val deviceIds = devices.keys
userEntity.devices.iterator().forEach { deviceInfoEntity -> userEntity.devices.toTypedArray().iterator().let {
while (it.hasNext()) {
val deviceInfoEntity = it.next()
if (deviceInfoEntity.deviceId !in deviceIds) { if (deviceInfoEntity.deviceId !in deviceIds) {
Timber.d("Remove device ${deviceInfoEntity.deviceId} of user $userId") Timber.d("Remove device ${deviceInfoEntity.deviceId} of user $userId")
deviceInfoEntity.deleteOnCascade() deviceInfoEntity.deleteOnCascade()
} }
} }
}
// Then update existing devices or add new one // Then update existing devices or add new one
devices.values.forEach { cryptoDeviceInfo -> devices.values.forEach { cryptoDeviceInfo ->
val existingDeviceInfoEntity = userEntity.devices.firstOrNull { it.deviceId == cryptoDeviceInfo.deviceId } val existingDeviceInfoEntity = userEntity.devices.firstOrNull { it.deviceId == cryptoDeviceInfo.deviceId }