From dddec7e7eea491090266ff8ec6385b1be98f7d6b Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Wed, 3 May 2023 10:25:38 +0200
Subject: [PATCH] Revert "Add "opaque interface declarations""

This reverts commit 396e0a3567c9f2ccddd5bc02bea8e4f390ae1c5a.
---
 bindings/matrix-sdk-ffi/src/api.udl                   | 4 ----
 bindings/matrix-sdk-ffi/src/authentication_service.rs | 1 +
 bindings/matrix-sdk-ffi/src/notification_service.rs   | 1 +
 bindings/matrix-sdk-ffi/src/tracing.rs                | 1 +
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bindings/matrix-sdk-ffi/src/api.udl b/bindings/matrix-sdk-ffi/src/api.udl
index 76e2de280..dabf4c60d 100644
--- a/bindings/matrix-sdk-ffi/src/api.udl
+++ b/bindings/matrix-sdk-ffi/src/api.udl
@@ -8,10 +8,6 @@ callback interface NotificationDelegate {
     void did_receive_notification(NotificationItem notification);
 };
 
-interface AuthenticationService {};
-interface Span {};
-interface NotificationService {};
-
 dictionary NotificationItem {
     TimelineEvent event;
     string room_id;
diff --git a/bindings/matrix-sdk-ffi/src/authentication_service.rs b/bindings/matrix-sdk-ffi/src/authentication_service.rs
index 19aa92383..fae7387d8 100644
--- a/bindings/matrix-sdk-ffi/src/authentication_service.rs
+++ b/bindings/matrix-sdk-ffi/src/authentication_service.rs
@@ -11,6 +11,7 @@ use zeroize::Zeroize;
 use super::{client::Client, client_builder::ClientBuilder, RUNTIME};
 use crate::error::ClientError;
 
+#[derive(uniffi::Object)]
 pub struct AuthenticationService {
     base_path: String,
     passphrase: Option<String>,
diff --git a/bindings/matrix-sdk-ffi/src/notification_service.rs b/bindings/matrix-sdk-ffi/src/notification_service.rs
index 16cf23fbf..64f3d8977 100644
--- a/bindings/matrix-sdk-ffi/src/notification_service.rs
+++ b/bindings/matrix-sdk-ffi/src/notification_service.rs
@@ -51,6 +51,7 @@ impl NotificationItem {
 }
 
 #[allow(dead_code)]
+#[derive(uniffi::Object)]
 pub struct NotificationService {
     base_path: String,
     user_id: String,
diff --git a/bindings/matrix-sdk-ffi/src/tracing.rs b/bindings/matrix-sdk-ffi/src/tracing.rs
index d85ce08ee..c530f33f3 100644
--- a/bindings/matrix-sdk-ffi/src/tracing.rs
+++ b/bindings/matrix-sdk-ffi/src/tracing.rs
@@ -95,6 +95,7 @@ fn span_or_event_enabled(callsite: &'static DefaultCallsite) -> bool {
     }
 }
 
+#[derive(uniffi::Object)]
 pub struct Span(tracing::Span);
 
 #[uniffi::export]