mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-15 03:25:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

ffi: Use async-uniffi instead of block_on in app module

Browse Source
This commit is contained in:
Jonas Platte
2023-07-13 11:34:48 +02:00
committed by Jonas Platte
parent 6f2fee8965
commit aee2ef6abf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bindings/matrix-sdk-ffi/src/app.rs
View File

@@ -52,7 +52,7 @@ pub struct App {
inner: MatrixApp,
}
#[uniffi::export]
#[uniffi::export(async_runtime = "tokio")]
impl App {
pub fn room_list_service(&self) -> Arc<RoomListService> {
Arc::new(RoomListService { inner: self.inner.room_list_service() })
@@ -70,9 +70,9 @@ impl App {
})))
}
pub fn start(&self) -> Result<(), ClientError> {
pub async fn start(&self) -> Result<(), ClientError> {
let start = self.inner.start();
RUNTIME.block_on(async { Ok(start.await?) })
Ok(start.await?)
}
pub fn pause(&self) -> Result<(), ClientError> {
@@ -91,7 +91,7 @@ impl AppBuilder {
}
}
#[uniffi::export]
#[uniffi::export(async_runtime = "tokio")]
impl AppBuilder {
pub fn with_encryption_sync(
self: Arc<Self>,
@@ -103,8 +103,8 @@ impl AppBuilder {
Arc::new(Self { builder })
}
pub fn finish(self: Arc<Self>) -> Result<Arc<App>, ClientError> {
pub async fn finish(self: Arc<Self>) -> Result<Arc<App>, ClientError> {
let this = unwrap_or_clone_arc(self);
RUNTIME.block_on(async move { Ok(Arc::new(App { inner: this.builder.build().await? })) })
Ok(Arc::new(App { inner: this.builder.build().await? }))
}
}