crypto: Get devices from the rust-sdk

2021-03-30 13:47:15 +02:00 · 2021-03-30 13:47:15 +02:00 · 9d5ef01ce0
commit 9d5ef01ce0
parent 5533c2acae
1 changed files with 9 additions and 1 deletions
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@ -395,7 +395,15 @@ internal class DefaultCryptoService @Inject constructor(
     */
    override fun getDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo? {
        return if (userId.isNotEmpty() && !deviceId.isNullOrEmpty()) {
-            cryptoStore.getUserDevice(userId, deviceId)
+            val device = runBlocking {
+                olmMachine!!.getDevice(userId, deviceId)
+            }
+
+            if (device != null) {
+                device.toCryptoDeviceInfo()
+            } else {
+                null
+            }
        } else {
            null
        }