Move matrix-sdk-crypto enum definitions out of UDL

bindings/matrix-sdk-crypto-ffi/Cargo.toml

@@ -41,7 +41,7 @@ features = ["lax_deserialize"]
 
 [dependencies.matrix-sdk-crypto]
 workspace = true
-features = ["qrcode", "automatic-room-key-forwarding"]
+features = ["qrcode", "automatic-room-key-forwarding", "uniffi"]
 
 [dependencies.matrix-sdk-sqlite]
 workspace = true
@@ -53,7 +53,6 @@ default_features = false
 features = ["rt-multi-thread"]
 
 [build-dependencies]
-uniffi = { workspace = true, features = ["build"] }
 vergen = { version = "8.2.5", features = ["build", "git", "gitcl"] }
 
 [dev-dependencies]

bindings/matrix-sdk-crypto-ffi/build.rs

@@ -31,7 +31,6 @@ fn setup_x86_64_android_workaround() {
 
 fn main() -> Result<(), Box<dyn Error>> {
     setup_x86_64_android_workaround();
-    uniffi::generate_scaffolding("./src/olm.udl")?;
 
     EmitBuilder::builder().git_sha(true).git_describe(true, false, None).emit()?;
 

bindings/matrix-sdk-crypto-ffi/src/lib.rs

@@ -31,11 +31,10 @@ pub use logger::{set_logger, Logger};
 pub use machine::{KeyRequestPair, OlmMachine, SignatureVerification};
 use matrix_sdk_common::deserialized_responses::ShieldState as RustShieldState;
 use matrix_sdk_crypto::{
-    backups::SignatureState,
     olm::{IdentityKeys, InboundGroupSession, Session},
     store::{Changes, CryptoStore, PendingChanges, RoomSettings as RustRoomSettings},
     types::{EventEncryptionAlgorithm as RustEventEncryptionAlgorithm, SigningKey},
-    EncryptionSettings as RustEncryptionSettings, LocalTrust,
+    EncryptionSettings as RustEncryptionSettings,
 };
 use matrix_sdk_sqlite::SqliteCryptoStore;
 pub use responses::{
@@ -886,7 +885,7 @@ fn vodozemac_version() -> String {
     vodozemac::VERSION.to_owned()
 }
 
-uniffi::include_scaffolding!("olm");
+uniffi::setup_scaffolding!();
 
 #[cfg(test)]
 mod tests {

bindings/matrix-sdk-crypto-ffi/src/olm.udl

@@ -1,15 +0,0 @@
-namespace matrix_sdk_crypto_ffi {};
-
-enum LocalTrust {
-    "Verified",
-    "BlackListed",
-    "Ignored",
-    "Unset",
-};
-
-enum SignatureState {
-    "Missing",
-    "Invalid",
-    "ValidButNotTrusted",
-    "ValidAndTrusted",
-};