Merge pull request #3804 from vector-im/feature/ons/fix_deleting_user_device
Fix error when sending encrypted message if someone in the room logs out
This commit is contained in:
commit
60a210194d
|
@ -0,0 +1 @@
|
|||
Fix error when sending encrypted message if someone in the room logs out.
|
|
@ -286,12 +286,15 @@ internal class RealmCryptoStore @Inject constructor(
|
|||
val userEntity = UserEntity.getOrCreate(realm, userId)
|
||||
// First delete the removed devices
|
||||
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) {
|
||||
Timber.d("Remove device ${deviceInfoEntity.deviceId} of user $userId")
|
||||
deviceInfoEntity.deleteOnCascade()
|
||||
}
|
||||
}
|
||||
}
|
||||
// Then update existing devices or add new one
|
||||
devices.values.forEach { cryptoDeviceInfo ->
|
||||
val existingDeviceInfoEntity = userEntity.devices.firstOrNull { it.deviceId == cryptoDeviceInfo.deviceId }
|
||||
|
|
Loading…
Reference in New Issue