chore: Remove the matrix-sdk-crypto re-export in the matrix-sdk crate

Author: poljar

Cargo.lock

@@ -54,6 +54,7 @@ matrix-sdk = { workspace = true, features = [
     "sqlite",
     "uniffi",
 ] }
+matrix-sdk-base.workspace = true
 matrix-sdk-common.workspace = true
 matrix-sdk-ffi-macros.workspace = true
 matrix-sdk-ui = { workspace = true, features = ["uniffi"] }

bindings/matrix-sdk-ffi/Cargo.toml

@@ -3,7 +3,6 @@ use std::{fs, num::NonZeroUsize, path::Path, sync::Arc, time::Duration};
 #[cfg(not(target_family = "wasm"))]
 use matrix_sdk::reqwest::Certificate;
 use matrix_sdk::{
-    crypto::{CollectStrategy, DecryptionSettings, TrustRequirement},
     encryption::{BackupDownloadStrategy, EncryptionSettings},
     event_cache::EventCacheError,
     ruma::{ServerName, UserId},
@@ -14,6 +13,7 @@ use matrix_sdk::{
     Client as MatrixClient, ClientBuildError as MatrixClientBuildError, HttpError, IdParseError,
     RumaApiError, SqliteStoreConfig, ThreadingSupport,
 };
+use matrix_sdk_base::crypto::{CollectStrategy, DecryptionSettings, TrustRequirement};
 use ruma::api::error::{DeserializationError, FromHttpResponseError};
 use tracing::debug;
 use zeroize::Zeroizing;

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use matrix_sdk::crypto::IdentityState;
+use matrix_sdk_base::crypto::IdentityState;
 
 #[derive(uniffi::Record)]
 pub struct IdentityStatusChange {

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

@@ -1,14 +1,11 @@
 use std::sync::Arc;
 
-use matrix_sdk::{
-    authentication::oauth::{
-        qrcode::{
-            self, CheckCodeSender as SdkCheckCodeSender, CheckCodeSenderError,
-            DeviceCodeErrorResponseType, GeneratedQrProgress, LoginFailureReason, QrProgress,
-        },
-        OAuth,
+use matrix_sdk::authentication::oauth::{
+    qrcode::{
+        self, CheckCodeSender as SdkCheckCodeSender, CheckCodeSenderError,
+        DeviceCodeErrorResponseType, GeneratedQrProgress, LoginFailureReason, QrProgress,
     },
-    crypto::types::qr_login::{LoginQrCodeDecodeError, QrCodeModeData},
+    OAuth,
 };
 use matrix_sdk_common::{stream::StreamExt, SendOutsideWasm, SyncOutsideWasm};
 
@@ -152,8 +149,8 @@ impl QrCodeData {
     /// will return `None`.
     pub fn server_name(&self) -> Option<String> {
         match &self.inner.mode_data {
-            QrCodeModeData::Reciprocate { server_name } => Some(server_name.to_owned()),
-            QrCodeModeData::Login => None,
+            qrcode::QrCodeModeData::Reciprocate { server_name } => Some(server_name.to_owned()),
+            qrcode::QrCodeModeData::Login => None,
         }
     }
 }
@@ -165,7 +162,7 @@ pub enum QrCodeDecodeError {
     #[error("Error decoding QR code: {error:?}")]
     Crypto {
         #[from]
-        error: LoginQrCodeDecodeError,
+        error: qrcode::LoginQrCodeDecodeError,
     },
 }
 

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

@@ -3,7 +3,7 @@ use std::{collections::HashMap, fs, path::PathBuf, pin::pin, sync::Arc};
 use anyhow::{Context, Result};
 use futures_util::{pin_mut, StreamExt};
 use matrix_sdk::{
-    crypto::LocalTrust,
+    encryption::LocalTrust,
     room::{
         edit::EditedContent, power_levels::RoomPowerLevelChanges, Room as SdkRoom, RoomMemberRole,
         TryFromReportedContentScoreError,

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

@@ -14,7 +14,7 @@
 
 use std::{collections::HashMap, sync::Arc};
 
-use matrix_sdk::crypto::types::events::UtdCause;
+use matrix_sdk_base::crypto::types::events::UtdCause;
 use ruma::events::{room::MediaSource as RumaMediaSource, MessageLikeEventContent};
 
 use super::{

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

@@ -14,7 +14,7 @@
 
 use std::{fmt::Debug, sync::Arc, time::Duration};
 
-use matrix_sdk::crypto::types::events::UtdCause;
+use matrix_sdk_base::crypto::types::events::UtdCause;
 use matrix_sdk_common::{SendOutsideWasm, SyncOutsideWasm};
 use matrix_sdk_ui::unable_to_decrypt_hook::{
     UnableToDecryptHook, UnableToDecryptInfo as SdkUnableToDecryptInfo,

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

@@ -23,12 +23,12 @@ use imbl::Vector;
 use itertools::{Either, Itertools as _};
 use matrix_sdk::{
     Client, Room,
-    crypto::store::types::RoomKeyInfo,
     deserialized_responses::TimelineEventKind as SdkTimelineEventKind,
     encryption::backups::BackupState,
     event_handler::EventHandlerHandle,
     executor::{JoinHandle, spawn},
 };
+use matrix_sdk_base::crypto::store::types::RoomKeyInfo;
 use tokio::sync::{
     RwLock,
     mpsc::{self, Receiver, Sender},
@@ -516,10 +516,8 @@ mod tests {
     use std::{collections::BTreeMap, sync::Arc, time::SystemTime};
 
     use imbl::vector;
-    use matrix_sdk::{
-        crypto::types::events::UtdCause,
-        deserialized_responses::{AlgorithmInfo, EncryptionInfo, VerificationState},
-    };
+    use matrix_sdk::deserialized_responses::{AlgorithmInfo, EncryptionInfo, VerificationState};
+    use matrix_sdk_base::crypto::types::events::UtdCause;
     use ruma::{
         MilliSecondsSinceUnixEpoch, OwnedTransactionId,
         events::room::{

crates/matrix-sdk-ui/src/timeline/controller/decryption_retry_task.rs

@@ -17,10 +17,10 @@ use std::{borrow::Cow, sync::Arc};
 use as_variant::as_variant;
 use indexmap::IndexMap;
 use matrix_sdk::{
-    crypto::types::events::UtdCause,
     deserialized_responses::{EncryptionInfo, UnableToDecryptInfo},
     send_queue::SendHandle,
 };
+use matrix_sdk_base::crypto::types::events::UtdCause;
 use ruma::{
     EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedTransactionId, OwnedUserId,
     TransactionId,