From 52d2fa1a7233fa4c08d3c60a4019c596962ee015 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Thu, 15 Jun 2023 11:26:46 +0200
Subject: [PATCH] ffi: Clean up

---
 bindings/matrix-sdk-ffi/src/api.udl         | 2 --
 bindings/matrix-sdk-ffi/src/event.rs        | 1 +
 bindings/matrix-sdk-ffi/src/lib.rs          | 7 +++++--
 bindings/matrix-sdk-ffi/src/platform.rs     | 2 +-
 bindings/matrix-sdk-ffi/src/room_list.rs    | 3 ++-
 bindings/matrix-sdk-ffi/src/sliding_sync.rs | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bindings/matrix-sdk-ffi/src/api.udl b/bindings/matrix-sdk-ffi/src/api.udl
index 7799ea481..4f8d2eed1 100644
--- a/bindings/matrix-sdk-ffi/src/api.udl
+++ b/bindings/matrix-sdk-ffi/src/api.udl
@@ -1,7 +1,5 @@
 namespace matrix_sdk_ffi {};
 
-interface TimelineEvent {};
-
 enum SlidingSyncState {
     /// Sliding Sync has not started to load anything yet.
     "NotLoaded",
diff --git a/bindings/matrix-sdk-ffi/src/event.rs b/bindings/matrix-sdk-ffi/src/event.rs
index eaf779e01..e4dcefafc 100644
--- a/bindings/matrix-sdk-ffi/src/event.rs
+++ b/bindings/matrix-sdk-ffi/src/event.rs
@@ -7,6 +7,7 @@ use ruma::events::{
 
 use crate::{room_member::MembershipState, timeline::MessageType, ClientError};
 
+#[derive(uniffi::Object)]
 pub struct TimelineEvent(pub(crate) AnySyncTimelineEvent);
 
 #[uniffi::export]
diff --git a/bindings/matrix-sdk-ffi/src/lib.rs b/bindings/matrix-sdk-ffi/src/lib.rs
index 4b3ab9072..f7972f12b 100644
--- a/bindings/matrix-sdk-ffi/src/lib.rs
+++ b/bindings/matrix-sdk-ffi/src/lib.rs
@@ -44,8 +44,11 @@ use matrix_sdk::{
 };
 
 use self::{
-    client::*, error::ClientError, event::*, platform::*, session_verification::*,
-    task_handle::TaskHandle, timeline::MediaSourceExt,
+    client::{CreateRoomParameters, RoomPreset, RoomVisibility},
+    error::ClientError,
+    session_verification::{SessionVerificationControllerDelegate, SessionVerificationEmoji},
+    task_handle::TaskHandle,
+    timeline::MediaSourceExt,
 };
 
 uniffi::include_scaffolding!("api");
diff --git a/bindings/matrix-sdk-ffi/src/platform.rs b/bindings/matrix-sdk-ffi/src/platform.rs
index 035062c9b..66643a6cb 100644
--- a/bindings/matrix-sdk-ffi/src/platform.rs
+++ b/bindings/matrix-sdk-ffi/src/platform.rs
@@ -117,7 +117,7 @@ fn setup_otlp_tracing_helper(
     password: String,
     otlp_endpoint: String,
 ) -> anyhow::Result<()> {
-    let otlp_tracer = super::create_otlp_tracer(user, password, otlp_endpoint, client_name)?;
+    let otlp_tracer = create_otlp_tracer(user, password, otlp_endpoint, client_name)?;
     let otlp_layer = tracing_opentelemetry::layer().with_tracer(otlp_tracer);
 
     tracing_subscriber::registry()
diff --git a/bindings/matrix-sdk-ffi/src/room_list.rs b/bindings/matrix-sdk-ffi/src/room_list.rs
index c4650148d..f4d1b3129 100644
--- a/bindings/matrix-sdk-ffi/src/room_list.rs
+++ b/bindings/matrix-sdk-ffi/src/room_list.rs
@@ -8,10 +8,11 @@ use futures_util::{pin_mut, StreamExt};
 use ruma::RoomId;
 
 use crate::{
+    client::Client,
     room::Room,
     sliding_sync::{RoomListEntry, RoomSubscription, UnreadNotificationsCount},
     timeline::EventTimelineItem,
-    Client, TaskHandle, RUNTIME,
+    TaskHandle, RUNTIME,
 };
 
 #[uniffi::export]
diff --git a/bindings/matrix-sdk-ffi/src/sliding_sync.rs b/bindings/matrix-sdk-ffi/src/sliding_sync.rs
index 38adc88b4..03628314f 100644
--- a/bindings/matrix-sdk-ffi/src/sliding_sync.rs
+++ b/bindings/matrix-sdk-ffi/src/sliding_sync.rs
@@ -19,11 +19,12 @@ use matrix_sdk_ui::timeline::SlidingSyncRoomExt;
 use tracing::{error, warn};
 
 use crate::{
+    client::Client,
     error::ClientError,
     helpers::unwrap_or_clone_arc,
     room::{Room, TimelineLock},
     timeline::{EventTimelineItem, TimelineDiff, TimelineItem, TimelineListener},
-    Client, TaskHandle, RUNTIME,
+    TaskHandle, RUNTIME,
 };
 
 #[derive(uniffi::Object)]