Merge branch 'matrix-sdk/fix-no-encryption-build'

matrix_sdk/Cargo.toml

@@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "feature=\"docs\""]
 [features]
 default = ["encryption", "sled_cryptostore", "sled_state_store", "native-tls"]
 
-encryption = ["matrix-sdk-base/encryption", "dashmap"]
+encryption = ["matrix-sdk-base/encryption"]
 sled_state_store = ["matrix-sdk-base/sled_state_store"]
 sled_cryptostore = ["matrix-sdk-base/sled_cryptostore"]
 unstable-synapse-quirks = ["matrix-sdk-base/unstable-synapse-quirks"]
@@ -30,7 +30,7 @@ sso_login = ["warp", "rand", "tokio-stream"]
 docs = ["encryption", "sled_cryptostore", "sled_state_store", "sso_login"]
 
 [dependencies]
-dashmap = { version = "4.0.2", optional = true }
+dashmap = "4.0.2"
 futures = "0.3.12"
 http = "0.2.3"
 serde_json = "1.0.61"

matrix_sdk/src/client.rs

@@ -31,7 +31,6 @@ use std::{
     sync::Arc,
 };
 
-#[cfg(feature = "encryption")]
 use dashmap::DashMap;
 use futures_timer::Delay as sleep;
 use http::HeaderValue;
@@ -116,18 +115,17 @@ use matrix_sdk_common::locks::Mutex;
 
 use crate::{
     error::HttpError,
+    event_handler::Handler,
     http_client::{client_with_config, HttpClient, HttpSend},
-    room, Error, OutgoingRequest, Result,
+    room, Error, EventHandler, OutgoingRequest, Result,
 };
 
 #[cfg(feature = "encryption")]
 use crate::{
     device::{Device, UserDevices},
-    event_handler::Handler,
     identifiers::DeviceId,
     sas::Sas,
     verification_request::VerificationRequest,
-    EventHandler,
 };
 
 const DEFAULT_REQUEST_TIMEOUT: Duration = Duration::from_secs(10);
@@ -1525,7 +1523,6 @@ impl Client {
         content: impl Into<AnyMessageEventContent>,
         txn_id: Option<Uuid>,
     ) -> Result<send_message_event::Response> {
-        #[cfg(feature = "encryption")]
         if let Some(room) = self.get_joined_room(room_id) {
             room.send(content, txn_id).await
         } else {