rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: Only add our own devices if we're requesting devices for our own user

Browse Source
This commit is contained in:
Damir Jelić 2021-07-08 16:51:57 +02:00
parent 80e80e07b3
commit d4090c4b0a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -619,12 +619,15 @@ internal class OlmMachine(
*/ */
@Throws(CryptoStoreErrorException::class) @Throws(CryptoStoreErrorException::class)
suspend fun getUserDevices(userId: String): List<CryptoDeviceInfo> { suspend fun getUserDevices(userId: String): List<CryptoDeviceInfo> {
val ownDevice = ownDevice()
val devices = inner.getUserDevices(userId).map { toCryptoDeviceInfo(it) }.toMutableList() val devices = inner.getUserDevices(userId).map { toCryptoDeviceInfo(it) }.toMutableList()
// EA doesn't differentiate much between our own and other devices of // EA doesn't differentiate much between our own and other devices of
// while the rust-sdk does, append our own device here. // while the rust-sdk does, append our own device here.
val ownDevice = this.ownDevice()
if (userId == ownDevice.userId) {
devices.add(ownDevice) devices.add(ownDevice)
}
return devices return devices
} }