Merge pull request #8457 from vector-im/feature/bca/fix_bad_device_list

BillCarsonFr · web-flow · commit df1641995ee7 · 2023-05-23T14:58:10.000+02:00
fix always returning live devices for current user
diff --git a/changelog.d/8457.bugfix b/changelog.d/8457.bugfix
@@ -0,0 +1 @@
+Fix: The device list screen from the member profile page was always showing the current user devices (rust crypto).
diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt
@@ -360,9 +360,7 @@ internal class RustCryptoService @Inject constructor(
     }
 
     override fun getLiveCryptoDeviceInfo(userIds: List<String>): LiveData<List<CryptoDeviceInfo>> {
-        return olmMachine.getLiveDevices(listOf(myUserId)).map {
-            it.filter { it.userId == myUserId }
-        }
+        return olmMachine.getLiveDevices(userIds)
     }
 
     override fun getLiveCryptoDeviceInfoWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>> {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix: The device list screen from the member profile page was always showing the current user devices (rust crypto).`
Original file line number	Diff line number	Diff line change
`@@ -360,9 +360,7 @@ internal class RustCryptoService @Inject constructor(`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`override fun getLiveCryptoDeviceInfo(userIds: List<String>): LiveData<List<CryptoDeviceInfo>> {`
`363`		`- return olmMachine.getLiveDevices(listOf(myUserId)).map {`
`364`		`- it.filter { it.userId == myUserId }`
`365`		`- }`
	`363`	`+ return olmMachine.getLiveDevices(userIds)`
`366`	`364`	`}`
`367`	`365`
`368`	`366`	`override fun getLiveCryptoDeviceInfoWithId(deviceId: String): LiveData<Optional<CryptoDeviceInfo>> {`