diff --git a/bindings/matrix-sdk-ffi/src/notification_settings.rs b/bindings/matrix-sdk-ffi/src/notification_settings.rs index 239031aaa..408232def 100644 --- a/bindings/matrix-sdk-ffi/src/notification_settings.rs +++ b/bindings/matrix-sdk-ffi/src/notification_settings.rs @@ -161,17 +161,6 @@ impl NotificationSettings { Ok(RoomNotificationSettings::new(mode.into(), true)) } - pub fn get_room_notification_settings_blocking( - self: Arc, - room_id: String, - is_encrypted: bool, - is_one_to_one: bool, - ) -> Result { - RUNTIME.block_on(async move { - self.get_room_notification_settings(room_id, is_encrypted, is_one_to_one).await - }) - } - /// Set the notification mode for a room. pub async fn set_room_notification_mode( &self, @@ -185,14 +174,6 @@ impl NotificationSettings { Ok(()) } - pub fn set_room_notification_mode_blocking( - self: Arc, - room_id: String, - mode: RoomNotificationMode, - ) -> Result<(), NotificationSettingsError> { - RUNTIME.block_on(async move { self.set_room_notification_mode(room_id, mode).await }) - } - /// Get the user defined room notification mode pub async fn get_user_defined_room_notification_mode( &self, @@ -211,13 +192,6 @@ impl NotificationSettings { } } - pub fn get_user_defined_room_notification_mode_blocking( - self: Arc, - room_id: String, - ) -> Result, NotificationSettingsError> { - RUNTIME.block_on(async move { self.get_user_defined_room_notification_mode(room_id).await }) - } - /// Get the default room notification mode /// /// The mode will depend on the associated `PushRule` based on whether the @@ -240,16 +214,6 @@ impl NotificationSettings { mode.into() } - pub fn get_default_room_notification_mode_blocking( - self: Arc, - is_encrypted: bool, - is_one_to_one: bool, - ) -> RoomNotificationMode { - RUNTIME.block_on(async move { - self.get_default_room_notification_mode(is_encrypted, is_one_to_one).await - }) - } - /// Set the default room notification mode /// /// # Arguments @@ -275,17 +239,6 @@ impl NotificationSettings { Ok(()) } - pub fn set_default_room_notification_mode_blocking( - self: Arc, - is_encrypted: bool, - is_one_to_one: bool, - mode: RoomNotificationMode, - ) -> Result<(), NotificationSettingsError> { - RUNTIME.block_on(async move { - self.set_default_room_notification_mode(is_encrypted, is_one_to_one, mode).await - }) - } - /// Restore the default notification mode for a room pub async fn restore_default_room_notification_mode( &self, @@ -298,36 +251,18 @@ impl NotificationSettings { Ok(()) } - pub fn restore_default_room_notification_mode_blocking( - self: Arc, - room_id: String, - ) -> Result<(), NotificationSettingsError> { - RUNTIME.block_on(async move { self.restore_default_room_notification_mode(room_id).await }) - } - /// Get all room IDs for which a user-defined rule exists. pub async fn get_rooms_with_user_defined_rules(&self, enabled: Option) -> Vec { let notification_settings = self.sdk_notification_settings.read().await; notification_settings.get_rooms_with_user_defined_rules(enabled).await } - pub fn get_rooms_with_user_defined_rules_blocking( - self: Arc, - enabled: Option, - ) -> Vec { - RUNTIME.block_on(async move { self.get_rooms_with_user_defined_rules(enabled).await }) - } - /// Get whether some enabled keyword rules exist. pub async fn contains_keywords_rules(&self) -> bool { let notification_settings = self.sdk_notification_settings.read().await; notification_settings.contains_keyword_rules().await } - pub fn contains_keywords_rules_blocking(self: Arc) -> bool { - RUNTIME.block_on(async move { self.contains_keywords_rules().await }) - } - /// Get whether room mentions are enabled. pub async fn is_room_mention_enabled(&self) -> Result { let notification_settings = self.sdk_notification_settings.read().await; @@ -340,12 +275,6 @@ impl NotificationSettings { Ok(enabled) } - pub fn is_room_mention_enabled_blocking( - self: Arc, - ) -> Result { - RUNTIME.block_on(async move { self.is_room_mention_enabled().await }) - } - /// Set whether room mentions are enabled. pub async fn set_room_mention_enabled( &self, @@ -362,13 +291,6 @@ impl NotificationSettings { Ok(()) } - pub fn set_room_mention_enabled_blocking( - self: Arc, - enabled: bool, - ) -> Result<(), NotificationSettingsError> { - RUNTIME.block_on(async move { self.set_room_mention_enabled(enabled).await }) - } - /// Get whether user mentions are enabled. pub async fn is_user_mention_enabled(&self) -> Result { let notification_settings = self.sdk_notification_settings.read().await; @@ -381,12 +303,6 @@ impl NotificationSettings { Ok(enabled) } - pub fn is_user_mention_enabled_blocking( - self: Arc, - ) -> Result { - RUNTIME.block_on(async move { self.is_user_mention_enabled().await }) - } - /// Set whether user mentions are enabled. pub async fn set_user_mention_enabled( &self, @@ -403,13 +319,6 @@ impl NotificationSettings { Ok(()) } - pub fn set_user_mention_enabled_blocking( - self: Arc, - enabled: bool, - ) -> Result<(), NotificationSettingsError> { - RUNTIME.block_on(async move { self.set_user_mention_enabled(enabled).await }) - } - /// Get whether the `.m.rule.call` push rule is enabled pub async fn is_call_enabled(&self) -> Result { let notification_settings = self.sdk_notification_settings.read().await; @@ -419,10 +328,6 @@ impl NotificationSettings { Ok(enabled) } - pub fn is_call_enabled_blocking(self: Arc) -> Result { - RUNTIME.block_on(async move { self.is_call_enabled().await }) - } - /// Set whether the `.m.rule.call` push rule is enabled pub async fn set_call_enabled(&self, enabled: bool) -> Result<(), NotificationSettingsError> { let notification_settings = self.sdk_notification_settings.read().await; @@ -436,13 +341,6 @@ impl NotificationSettings { Ok(()) } - pub fn set_call_enabled_blocking( - self: Arc, - enabled: bool, - ) -> Result<(), NotificationSettingsError> { - RUNTIME.block_on(async move { self.set_call_enabled(enabled).await }) - } - /// Unmute a room. /// /// # Arguments @@ -465,14 +363,4 @@ impl NotificationSettings { .await?; Ok(()) } - - pub fn unmute_room_blocking( - self: Arc, - room_id: String, - is_encrypted: bool, - is_one_to_one: bool, - ) -> Result<(), NotificationSettingsError> { - RUNTIME - .block_on(async move { self.unmute_room(room_id, is_encrypted, is_one_to_one).await }) - } } diff --git a/bindings/matrix-sdk-ffi/src/room.rs b/bindings/matrix-sdk-ffi/src/room.rs index 5fb3abad5..8d9ed2922 100644 --- a/bindings/matrix-sdk-ffi/src/room.rs +++ b/bindings/matrix-sdk-ffi/src/room.rs @@ -197,10 +197,6 @@ impl Room { Ok(()) } - pub fn fetch_members_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.fetch_members().await }) - } - pub fn display_name(&self) -> Result { let r = self.inner.clone(); RUNTIME.block_on(async move { Ok(r.display_name().await?.to_string()) }) @@ -218,23 +214,12 @@ impl Room { Ok(Arc::new(RoomMembersIterator::new(self.inner.members(RoomMemberships::empty()).await?))) } - pub fn members_blocking(self: Arc) -> Result, ClientError> { - RUNTIME.block_on(async move { self.members().await }) - } - pub async fn member(&self, user_id: String) -> Result, ClientError> { let user_id = UserId::parse(&*user_id).context("Invalid user id.")?; let member = self.inner.get_member(&user_id).await?.context("No user found")?; Ok(Arc::new(RoomMember::new(member))) } - pub fn member_blocking( - self: Arc, - user_id: String, - ) -> Result, ClientError> { - RUNTIME.block_on(async move { self.member(user_id).await }) - } - pub fn member_avatar_url(&self, user_id: String) -> Result, ClientError> { let room = self.inner.clone(); RUNTIME.block_on(async move { @@ -285,13 +270,6 @@ impl Room { } } - pub async fn add_timeline_listener_blocking( - self: Arc, - listener: Box, - ) -> RoomTimelineListenerResult { - RUNTIME.block_on(async move { self.add_timeline_listener(listener).await }) - } - pub async fn room_info(&self) -> Result { let avatar_url = self.inner.avatar_url(); @@ -328,10 +306,6 @@ impl Room { Ok(RoomInfo::new(&self.inner, avatar_url, latest_event).await?) } - pub fn room_info_blocking(self: Arc) -> Result { - RUNTIME.block_on(async move { self.room_info().await }) - } - pub fn subscribe_to_room_info_updates( self: Arc, listener: Box, @@ -981,37 +955,21 @@ impl Room { Ok(self.inner.can_user_redact(&user_id).await?) } - pub fn can_user_redact_blocking(self: Arc, user_id: String) -> Result { - RUNTIME.block_on(async move { self.can_user_redact(user_id).await }) - } - pub async fn can_user_ban(&self, user_id: String) -> Result { let user_id = UserId::parse(&user_id)?; Ok(self.inner.can_user_ban(&user_id).await?) } - pub fn can_user_ban_blocking(self: Arc, user_id: String) -> Result { - RUNTIME.block_on(async move { self.can_user_ban(user_id).await }) - } - pub async fn can_user_invite(&self, user_id: String) -> Result { let user_id = UserId::parse(&user_id)?; Ok(self.inner.can_user_invite(&user_id).await?) } - pub fn can_user_invite_blocking(self: Arc, user_id: String) -> Result { - RUNTIME.block_on(async move { self.can_user_invite(user_id).await }) - } - pub async fn can_user_kick(&self, user_id: String) -> Result { let user_id = UserId::parse(&user_id)?; Ok(self.inner.can_user_kick(&user_id).await?) } - pub fn can_user_kick_blocking(self: Arc, user_id: String) -> Result { - RUNTIME.block_on(async move { self.can_user_kick(user_id).await }) - } - pub async fn can_user_send_state( &self, user_id: String, @@ -1021,14 +979,6 @@ impl Room { Ok(self.inner.can_user_send_state(&user_id, state_event.into()).await?) } - pub fn can_user_send_state_blocking( - self: Arc, - user_id: String, - state_event: StateEventType, - ) -> Result { - RUNTIME.block_on(async move { self.can_user_send_state(user_id, state_event).await }) - } - pub async fn can_user_send_message( &self, user_id: String, @@ -1038,14 +988,6 @@ impl Room { Ok(self.inner.can_user_send_message(&user_id, message.into()).await?) } - pub fn can_user_send_message_blocking( - self: Arc, - user_id: String, - message: MessageLikeEventType, - ) -> Result { - RUNTIME.block_on(async move { self.can_user_send_message(user_id, message).await }) - } - pub async fn can_user_trigger_room_notification( &self, user_id: String, @@ -1054,13 +996,6 @@ impl Room { Ok(self.inner.can_user_trigger_room_notification(&user_id).await?) } - pub fn can_user_trigger_room_notification_blocking( - self: Arc, - user_id: String, - ) -> Result { - RUNTIME.block_on(async move { self.can_user_trigger_room_notification(user_id).await }) - } - pub fn own_user_id(&self) -> String { self.inner.own_user_id().to_string() } @@ -1135,10 +1070,6 @@ impl SendAttachmentJoinHandle { RUNTIME.spawn(async move { (&mut *join_hdl.lock().await).await.unwrap() }).await.unwrap() } - pub fn join_blocking(self: Arc) -> Result<(), RoomError> { - RUNTIME.block_on(async move { self.join().await }) - } - pub fn cancel(&self) { self.abort_hdl.abort(); } diff --git a/bindings/matrix-sdk-ffi/src/room_list.rs b/bindings/matrix-sdk-ffi/src/room_list.rs index 6cb7c0432..ddde6c8ef 100644 --- a/bindings/matrix-sdk-ffi/src/room_list.rs +++ b/bindings/matrix-sdk-ffi/src/room_list.rs @@ -436,11 +436,6 @@ impl RoomListItem { Ok(RoomInfo::new(self.inner.inner_room(), avatar_url, latest_event).await?) } - // Temporary workaround for coroutine leaks on Kotlin - pub fn room_info_blocking(self: Arc) -> Result { - RUNTIME.block_on(async move { self.room_info().await }) - } - /// Building a `Room`. /// /// Be careful that building a `Room` builds its entire `Timeline` at the diff --git a/bindings/matrix-sdk-ffi/src/session_verification.rs b/bindings/matrix-sdk-ffi/src/session_verification.rs index c1905c7d0..1acefc2d6 100644 --- a/bindings/matrix-sdk-ffi/src/session_verification.rs +++ b/bindings/matrix-sdk-ffi/src/session_verification.rs @@ -73,10 +73,6 @@ impl SessionVerificationController { Ok(()) } - pub fn request_verification_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.request_verification().await }) - } - pub async fn start_sas_verification(&self) -> Result<(), ClientError> { let verification_request = self.verification_request.read().unwrap().clone(); @@ -103,10 +99,6 @@ impl SessionVerificationController { Ok(()) } - pub fn start_sas_verification_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.start_sas_verification().await }) - } - pub async fn approve_verification(&self) -> Result<(), ClientError> { let sas_verification = self.sas_verification.read().unwrap().clone(); if let Some(sas_verification) = sas_verification { @@ -116,10 +108,6 @@ impl SessionVerificationController { Ok(()) } - pub fn approve_verification_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.approve_verification().await }) - } - pub async fn decline_verification(&self) -> Result<(), ClientError> { let sas_verification = self.sas_verification.read().unwrap().clone(); if let Some(sas_verification) = sas_verification { @@ -129,10 +117,6 @@ impl SessionVerificationController { Ok(()) } - pub fn decline_verification_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.decline_verification().await }) - } - pub async fn cancel_verification(&self) -> Result<(), ClientError> { let verification_request = self.verification_request.read().unwrap().clone(); if let Some(verification) = verification_request { @@ -141,10 +125,6 @@ impl SessionVerificationController { Ok(()) } - - pub fn cancel_verification_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.cancel_verification().await }) - } } impl SessionVerificationController { diff --git a/bindings/matrix-sdk-ffi/src/sync_service.rs b/bindings/matrix-sdk-ffi/src/sync_service.rs index 0e6b05ec7..b1441ea6c 100644 --- a/bindings/matrix-sdk-ffi/src/sync_service.rs +++ b/bindings/matrix-sdk-ffi/src/sync_service.rs @@ -65,18 +65,10 @@ impl SyncService { self.inner.start().await; } - pub fn start_blocking(self: Arc) { - RUNTIME.block_on(async move { self.start().await }); - } - pub async fn stop(&self) -> Result<(), ClientError> { Ok(self.inner.stop().await?) } - pub fn stop_blocking(self: Arc) -> Result<(), ClientError> { - RUNTIME.block_on(async move { self.stop().await }) - } - pub fn state(&self, listener: Box) -> Arc { let state_stream = self.inner.state(); @@ -113,8 +105,4 @@ impl SyncServiceBuilder { let this = unwrap_or_clone_arc(self); Ok(Arc::new(SyncService { inner: Arc::new(this.builder.build().await?) })) } - - pub fn finish_blocking(self: Arc) -> Result, ClientError> { - RUNTIME.block_on(self.finish()) - } }