fix(crypto): Don't enable the backup feature by default

Author: poljar

crates/matrix-sdk-crypto/Cargo.toml

@@ -16,7 +16,7 @@ features = ["docs"]
 rustdoc-args = ["--cfg", "feature=\"docs\""]
 
 [features]
-default = ["backups_v1"]
+default = []
 qrcode = ["matrix-qrcode"]
 backups_v1 = []
 sled_cryptostore = ["sled"]

crates/matrix-sdk-crypto/src/lib.rs

@@ -26,7 +26,6 @@
 )]
 
 #[cfg(feature = "backups_v1")]
-#[cfg_attr(feature = "docs", doc(cfg(backups_v1)))]
 pub mod backups;
 mod error;
 mod file_encryption;

crates/matrix-sdk-crypto/src/store/sled.rs

@@ -983,29 +983,33 @@ impl CryptoStore for SledStore {
     }
 
     async fn load_backup_keys(&self) -> Result<BackupKeys> {
-        let version = self
-            .account
-            .get("backup_version_v1".encode())?
-            .map(|v| serde_json::from_slice(&v))
-            .transpose()?;
-
         #[cfg(feature = "backups_v1")]
-        let recovery_key = {
-            self.account
-                .get("recovery_key_v1".encode())?
-                .map(|p| serde_json::from_slice(&p))
-                .transpose()?
-                .map(|p| {
-                    crate::backups::RecoveryKey::from_pickle(p, self.get_pickle_key())
-                        .map_err(|_| CryptoStoreError::UnpicklingError)
-                })
-                .transpose()?
+        let key = {
+            let backup_version = self
+                .account
+                .get("backup_version_v1".encode())?
+                .map(|v| serde_json::from_slice(&v))
+                .transpose()?;
+
+            let recovery_key = {
+                self.account
+                    .get("recovery_key_v1".encode())?
+                    .map(|p| serde_json::from_slice(&p))
+                    .transpose()?
+                    .map(|p| {
+                        crate::backups::RecoveryKey::from_pickle(p, self.get_pickle_key())
+                            .map_err(|_| CryptoStoreError::UnpicklingError)
+                    })
+                    .transpose()?
+            };
+
+            BackupKeys { backup_version, recovery_key }
         };
 
         #[cfg(not(feature = "backups_v1"))]
-        let recovery_key = None;
+        let key = BackupKeys {};
 
-        Ok(BackupKeys { backup_version: version, recovery_key })
+        Ok(key)
     }
 }