Allow room key forwarding to be enabled and disabled (matrix-org#1365)

Co-authored-by: Ivan Enderlin <[email protected]>

bindings/matrix-sdk-ffi/Cargo.toml

@@ -42,11 +42,38 @@ uniffi = { workspace = true }
 url = "2.2.2"
 zeroize = { workspace = true }
 
-
 [target.'cfg(target_os = "android")'.dependencies]
 log-panics = { version = "2", features = ["with-backtrace"]}
 tracing-android = "0.2.0"
-matrix-sdk = { path = "../../crates/matrix-sdk", default-features = false, features = ["anyhow", "experimental-timeline", "e2e-encryption", "sled", "markdown", "experimental-sliding-sync", "socks", "rustls-tls"], version = "0.6.0" }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-matrix-sdk = { path = "../../crates/matrix-sdk", features = ["anyhow", "experimental-timeline", "markdown", "experimental-sliding-sync", "socks"], version = "0.6.0" }
+tracing = { workspace = true }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+[target.'cfg(target_os = "android")'.dependencies.matrix-sdk]
+path = "../../crates/matrix-sdk"
+default-features = false
+features = [
+    "anyhow",
+    "experimental-sliding-sync",
+    "experimental-timeline",
+    "e2e-encryption",
+    "markdown", 
+    "sled",
+    "socks",
+    "rustls-tls",
+]
+
+[target.'cfg(not(target_os = "android"))'.dependencies.matrix-sdk]
+path = "../../crates/matrix-sdk"
+default-features = false
+features = [
+    "anyhow",
+    "experimental-sliding-sync",
+    "experimental-timeline",
+    "e2e-encryption",
+    "markdown",
+    "native-tls",
+    "sled",
+    "socks",
+]

crates/matrix-sdk-base/Cargo.toml

@@ -20,6 +20,7 @@ default = []
 e2e-encryption = ["dep:matrix-sdk-crypto"]
 js = ["matrix-sdk-common/js", "matrix-sdk-crypto?/js", "ruma/js", "matrix-sdk-store-encryption/js"]
 qrcode = ["matrix-sdk-crypto?/qrcode"]
+automatic-room-key-forwarding = ["matrix-sdk-crypto?/automatic-room-key-forwarding"]
 experimental-sliding-sync = ["ruma/unstable-msc3575"]
 
 # helpers for testing features build upon this
@@ -35,7 +36,7 @@ futures-core = "0.3.21"
 futures-util = { workspace = true }
 http = { workspace = true, optional = true }
 matrix-sdk-common = { version = "0.6.0", path = "../matrix-sdk-common" }
-matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", optional = true }
+matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", optional = true, default-features = false }
 matrix-sdk-store-encryption = { version = "0.2.0", path = "../matrix-sdk-store-encryption" }
 matrix-sdk-test = { version = "0.6.0", path = "../../testing/matrix-sdk-test", optional = true }
 once_cell = { workspace = true }

crates/matrix-sdk-crypto/Cargo.toml

@@ -15,7 +15,8 @@ version = "0.6.0"
 rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
-default = []
+default = ["automatic-room-key-forwarding"]
+automatic-room-key-forwarding = []
 js = ["ruma/js", "vodozemac/js"]
 qrcode = ["dep:matrix-sdk-qrcode"]
 backups_v1 = ["dep:olm-rs", "dep:bs58"]