Send/Sync bounds

Author: Daniel Salinas

bindings/matrix-sdk-ffi/src/client.rs

@@ -41,6 +41,7 @@ use matrix_sdk::{
     AuthApi, AuthSession, Client as MatrixClient, SessionChange, SessionTokens,
     STATE_STORE_DATABASE_NAME,
 };
+use matrix_sdk_common::{AsyncTraitDeps, SendOutsideWasm, SyncOutsideWasm};
 use matrix_sdk_ui::{
     notification_client::{
         NotificationClient as MatrixNotificationClient,
@@ -166,39 +167,39 @@ impl From<PushFormat> for RumaPushFormat {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait ClientDelegate: Sync + Send {
+pub trait ClientDelegate: SyncOutsideWasm + SendOutsideWasm {
     fn did_receive_auth_error(&self, is_soft_logout: bool);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait ClientSessionDelegate: Sync + Send {
+pub trait ClientSessionDelegate: AsyncTraitDeps {
     fn retrieve_session_from_keychain(&self, user_id: String) -> Result<Session, ClientError>;
     fn save_session_in_keychain(&self, session: Session);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait ProgressWatcher: Send + Sync {
+pub trait ProgressWatcher: SendOutsideWasm + SyncOutsideWasm {
     fn transmission_progress(&self, progress: TransmissionProgress);
 }
 
 /// A listener to the global (client-wide) error reporter of the send queue.
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait SendQueueRoomErrorListener: Sync + Send {
+pub trait SendQueueRoomErrorListener: SyncOutsideWasm + SendOutsideWasm {
     /// Called every time the send queue has ran into an error for a given room,
     /// which will disable the send queue for that particular room.
     fn on_error(&self, room_id: String, error: ClientError);
 }
 
 /// A listener for changes of global account data events.
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait AccountDataListener: Sync + Send {
+pub trait AccountDataListener: SyncOutsideWasm + SendOutsideWasm {
     /// Called when a global account data event has changed.
     fn on_change(&self, event: AccountDataEvent);
 }
 
 /// A listener for changes of room account data events.
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomAccountDataListener: Sync + Send {
+pub trait RoomAccountDataListener: SyncOutsideWasm + SendOutsideWasm {
     /// Called when a room account data event was changed.
     fn on_change(&self, event: RoomAccountDataEvent, room_id: String);
 }
@@ -1555,12 +1556,12 @@ impl Client {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait MediaPreviewConfigListener: Sync + Send {
+pub trait MediaPreviewConfigListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_change(&self, media_preview_config: Option<MediaPreviewConfig>);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait IgnoredUsersListener: Sync + Send {
+pub trait IgnoredUsersListener: SyncOutsideWasm + SendOutsideWasm {
     fn call(&self, ignored_user_ids: Vec<String>);
 }
 

bindings/matrix-sdk-ffi/src/client_builder.rs

@@ -1,5 +1,7 @@
 use std::{fs, num::NonZeroUsize, path::Path, sync::Arc, time::Duration};
 
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
+
 use async_compat::get_runtime_handle;
 use futures_util::StreamExt;
 use matrix_sdk::{
@@ -173,7 +175,7 @@ pub enum QrLoginProgress {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait QrLoginProgressListener: Sync + Send {
+pub trait QrLoginProgressListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, state: QrLoginProgress);
 }
 

bindings/matrix-sdk-ffi/src/encryption.rs

@@ -6,6 +6,7 @@ use matrix_sdk::{
     encryption,
     encryption::{backups, recovery},
 };
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use thiserror::Error;
 use tracing::{error, info};
 use zeroize::Zeroize;
@@ -25,22 +26,22 @@ pub struct Encryption {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait BackupStateListener: Sync + Send {
+pub trait BackupStateListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, status: BackupState);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait BackupSteadyStateListener: Sync + Send {
+pub trait BackupSteadyStateListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, status: BackupUploadState);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RecoveryStateListener: Sync + Send {
+pub trait RecoveryStateListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, status: RecoveryState);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait VerificationStateListener: Sync + Send {
+pub trait VerificationStateListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, status: VerificationState);
 }
 
@@ -164,7 +165,7 @@ impl From<recovery::RecoveryState> for RecoveryState {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait EnableRecoveryProgressListener: Sync + Send {
+pub trait EnableRecoveryProgressListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, status: EnableRecoveryProgress);
 }
 

bindings/matrix-sdk-ffi/src/notification_settings.rs

@@ -9,6 +9,7 @@ use matrix_sdk::{
     ruma::events::push_rules::PushRulesEvent,
     Client as MatrixClient,
 };
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use ruma::{
     push::{
         Action as SdkAction, ComparisonOperator as SdkComparisonOperator, PredefinedOverrideRuleId,
@@ -387,7 +388,7 @@ impl From<RoomNotificationMode> for SdkRoomNotificationMode {
 
 /// Delegate to notify of changes in push rules
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait NotificationSettingsDelegate: Sync + Send {
+pub trait NotificationSettingsDelegate: SyncOutsideWasm + SendOutsideWasm {
     fn settings_did_change(&self);
 }
 

bindings/matrix-sdk-ffi/src/room.rs

@@ -35,6 +35,8 @@ use ruma::{
 };
 use tracing::{error, warn};
 
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
+
 use crate::{
     chunk_iterator::ChunkIterator,
     client::{JoinRule, RoomVisibility},
@@ -1173,7 +1175,7 @@ impl Room {
 
 /// A listener for receiving new live location shares in a room.
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait LiveLocationShareListener: Sync + Send {
+pub trait LiveLocationShareListener: SyncOutsideWasm + SendOutsideWasm {
     fn call(&self, live_location_shares: Vec<LiveLocationShare>);
 }
 
@@ -1195,7 +1197,7 @@ impl From<matrix_sdk::room::knock_requests::KnockRequest> for KnockRequest {
 
 /// A listener for receiving new requests to a join a room.
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait KnockRequestsListener: Send + Sync {
+pub trait KnockRequestsListener: SendOutsideWasm + SyncOutsideWasm {
     fn call(&self, join_requests: Vec<KnockRequest>);
 }
 
@@ -1315,17 +1317,17 @@ impl From<RumaPowerLevels> for RoomPowerLevels {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomInfoListener: Sync + Send {
+pub trait RoomInfoListener: SyncOutsideWasm + SendOutsideWasm {
     fn call(&self, room_info: RoomInfo);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait TypingNotificationsListener: Sync + Send {
+pub trait TypingNotificationsListener: SyncOutsideWasm + SendOutsideWasm {
     fn call(&self, typing_user_ids: Vec<String>);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait IdentityStatusChangeListener: Sync + Send {
+pub trait IdentityStatusChangeListener: SyncOutsideWasm + SendOutsideWasm {
     fn call(&self, identity_status_change: Vec<IdentityStatusChange>);
 }
 

bindings/matrix-sdk-ffi/src/room_directory_search.rs

@@ -19,6 +19,7 @@ use async_compat::get_runtime_handle;
 use eyeball_im::VectorDiff;
 use futures_util::StreamExt;
 use matrix_sdk::room_directory_search::RoomDirectorySearch as SdkRoomDirectorySearch;
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use ruma::ServerName;
 use tokio::sync::RwLock;
 
@@ -198,6 +199,6 @@ impl From<VectorDiff<matrix_sdk::room_directory_search::RoomDescription>>
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomDirectorySearchEntriesListener: Send + Sync + Debug {
+pub trait RoomDirectorySearchEntriesListener: SendOutsideWasm + SyncOutsideWasm + Debug {
     fn on_update(&self, room_entries_update: Vec<RoomDirectorySearchEntryUpdate>);
 }

bindings/matrix-sdk-ffi/src/room_list.rs

@@ -12,6 +12,7 @@ use matrix_sdk::{
     },
     Room as SdkRoom,
 };
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use matrix_sdk_ui::{
     room_list_service::filters::{
         new_filter_all, new_filter_any, new_filter_category, new_filter_deduplicate_versions,
@@ -342,17 +343,17 @@ impl From<matrix_sdk_ui::room_list_service::RoomListLoadingState> for RoomListLo
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomListServiceStateListener: Send + Sync + Debug {
+pub trait RoomListServiceStateListener: SendOutsideWasm + SyncOutsideWasm + Debug {
     fn on_update(&self, state: RoomListServiceState);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomListLoadingStateListener: Send + Sync + Debug {
+pub trait RoomListLoadingStateListener: SendOutsideWasm + SyncOutsideWasm + Debug {
     fn on_update(&self, state: RoomListLoadingState);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomListServiceSyncIndicatorListener: Send + Sync + Debug {
+pub trait RoomListServiceSyncIndicatorListener: SendOutsideWasm + SyncOutsideWasm + Debug {
     fn on_update(&self, sync_indicator: RoomListServiceSyncIndicator);
 }
 
@@ -412,7 +413,7 @@ impl RoomListEntriesUpdate {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait RoomListEntriesListener: Send + Sync + Debug {
+pub trait RoomListEntriesListener: SendOutsideWasm + SyncOutsideWasm + Debug {
     fn on_update(&self, room_entries_update: Vec<RoomListEntriesUpdate>);
 }
 

bindings/matrix-sdk-ffi/src/session_verification.rs

@@ -11,6 +11,7 @@ use matrix_sdk::{
     ruma::events::key::verification::VerificationMethod,
     Account,
 };
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use ruma::UserId;
 use tracing::{error, warn};
 
@@ -51,7 +52,7 @@ pub struct SessionVerificationRequestDetails {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait SessionVerificationControllerDelegate: Sync + Send {
+pub trait SessionVerificationControllerDelegate: SyncOutsideWasm + SendOutsideWasm {
     fn did_receive_verification_request(&self, details: SessionVerificationRequestDetails);
     fn did_accept_verification_request(&self);
     fn did_start_sas_verification(&self);

bindings/matrix-sdk-ffi/src/sync_service.rs

@@ -17,6 +17,7 @@ use std::{fmt::Debug, sync::Arc};
 use async_compat::get_runtime_handle;
 use futures_util::pin_mut;
 use matrix_sdk::Client;
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use matrix_sdk_ui::{
     sync_service::{
         State as MatrixSyncServiceState, SyncService as MatrixSyncService,
@@ -51,7 +52,7 @@ impl From<MatrixSyncServiceState> for SyncServiceState {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait SyncServiceStateObserver: Send + Sync + Debug {
+pub trait SyncServiceStateObserver: SendOutsideWasm + SyncOutsideWasm + Debug {
     fn on_update(&self, state: SyncServiceState);
 }
 

bindings/matrix-sdk-ffi/src/timeline/mod.rs

@@ -85,6 +85,7 @@ mod msg_like;
 mod reply;
 
 use matrix_sdk::utils::formatted_body_from;
+use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 
 use crate::error::QueueWedgeError;
 
@@ -807,12 +808,12 @@ pub enum FocusEventError {
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait TimelineListener: Sync + Send {
+pub trait TimelineListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, diff: Vec<Arc<TimelineDiff>>);
 }
 
 #[matrix_sdk_ffi_macros::export(callback_interface)]
-pub trait PaginationStatusListener: Sync + Send {
+pub trait PaginationStatusListener: SyncOutsideWasm + SendOutsideWasm {
     fn on_update(&self, status: RoomPaginationStatus);
 }