From cfa7d39966547fbbf2f51cc3385d3a95de368fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 22 Dec 2025 10:11:31 +0100 Subject: [PATCH] Instantiate the now suspending `innerClient.spaceService()` `RustMatrixClient` with `runBlocking` for now --- .../element/android/libraries/matrix/impl/RustMatrixClient.kt | 4 +++- .../libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt index f3ceb1e425..4cb84abc03 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt @@ -151,7 +151,9 @@ class RustMatrixClient( private val sessionDispatcher = dispatchers.io.limitedParallelism(64) private val innerRoomListService = innerSyncService.roomListService() - private val innerSpaceService = innerClient.spaceService() + + // TODO refactor this and `innerNotificationClient` to be behind a suspend function instead + private val innerSpaceService = runBlocking { innerClient.spaceService() } override val roomMembershipObserver = RoomMembershipObserver() diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt index db33393ac2..dc9d21cddc 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt @@ -60,7 +60,7 @@ class FakeFfiClient( override suspend fun cachedAvatarUrl(): String? = null override suspend fun restoreSession(session: Session) = Unit override fun syncService(): SyncServiceBuilder = FakeFfiSyncServiceBuilder() - override fun spaceService(): SpaceService = FakeFfiSpaceService() + override suspend fun spaceService(): SpaceService = FakeFfiSpaceService() override fun roomDirectorySearch(): RoomDirectorySearch = FakeFfiRoomDirectorySearch() override suspend fun setPusher( identifiers: PusherIdentifiers,