Merge branch 'oidc_e2e'

Author: poljar

crates/matrix-sdk/src/authentication/oidc/cross_process.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+#[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::crypto::{
     store::{LockableCryptoStore, Store},
     CryptoStoreError,

crates/matrix-sdk/src/authentication/oidc/mod.rs

@@ -191,9 +191,9 @@ use mas_oidc_client::{
         IdToken,
     },
 };
-use matrix_sdk_base::{
-    crypto::types::qr_login::QrCodeData, once_cell::sync::OnceCell, SessionMeta,
-};
+#[cfg(feature = "e2e-encryption")]
+use matrix_sdk_base::crypto::types::qr_login::QrCodeData;
+use matrix_sdk_base::{once_cell::sync::OnceCell, SessionMeta};
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use ruma::api::client::discovery::get_authentication_issuer;
 use serde::{Deserialize, Serialize};