From 3fa9fc5b7bc7108a1fcce0bcec5b767b247a4324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 21 Jul 2021 16:28:12 +0200 Subject: [PATCH] crypto: Use a background task to fetch user devices --- .../org/matrix/android/sdk/internal/crypto/OlmMachine.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt index 6a1c3de291..21e759cf10 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt @@ -51,7 +51,6 @@ import uniffi.olm.OlmMachine as InnerMachine import uniffi.olm.ProgressListener as RustProgressListener import uniffi.olm.Request import uniffi.olm.RequestType -import uniffi.olm.Verification as InnerVerification import uniffi.olm.setLogger class CryptoLogger : Logger { @@ -462,7 +461,9 @@ internal class OlmMachine( */ @Throws(CryptoStoreErrorException::class) suspend fun getUserDevices(userId: String): List { - val devices = inner.getUserDevices(userId).map { toCryptoDeviceInfo(it) }.toMutableList() + val devices = withContext(Dispatchers.IO) { + inner.getUserDevices(userId).map { toCryptoDeviceInfo(it) }.toMutableList() + } // EA doesn't differentiate much between our own and other devices of // while the rust-sdk does, append our own device here.