Merge EventSendProgress::MediaUploadProgress and EventSendProgress::UploadedMedia into EventSendProgress::MediaUpload

Johennes · Johennes · commit c5d1ef2a36fa · 2025-05-27T20:35:43.000+02:00
diff --git a/bindings/matrix-sdk-ffi/src/timeline/mod.rs b/bindings/matrix-sdk-ffi/src/timeline/mod.rs
@@ -273,7 +273,7 @@ impl TryInto<Reply> for ReplyParameters {
 #[derive(Clone, Copy, uniffi::Enum)]
 pub enum EventSendProgress {
     /// A media is being uploaded.
-    MediaUploadProgress {
+    MediaUpload {
         /// The index of the media within the transaction. A file and its
         /// thumbnail share the same index.
         index: u64,
@@ -284,26 +284,13 @@ pub enum EventSendProgress {
         /// The current upload progress.
         progress: TransmissionProgress,
     },
-
-    /// A media has finished uploading.
-    UploadedMedia {
-        /// The index of the media within the transaction. A file and its
-        /// thumbnail share the same index.
-        index: u64,
-
-        /// Is the media a thumbnail?
-        is_thumbnail: bool,
-    },
 }
 
 impl From<SdkEventSendProgress> for EventSendProgress {
     fn from(value: SdkEventSendProgress) -> Self {
         match value {
-            SdkEventSendProgress::MediaUploadProgress { index, is_thumbnail, progress } => {
-                Self::MediaUploadProgress { index, is_thumbnail, progress: progress.into() }
-            }
-            SdkEventSendProgress::UploadedMedia { index, is_thumbnail } => {
-                Self::UploadedMedia { index, is_thumbnail }
+            SdkEventSendProgress::MediaUpload { index, is_thumbnail, progress } => {
+                Self::MediaUpload { index, is_thumbnail, progress: progress.into() }
             }
         }
     }
diff --git a/crates/matrix-sdk-base/src/store/send_queue.rs b/crates/matrix-sdk-base/src/store/send_queue.rs
@@ -379,6 +379,10 @@ pub struct SentMediaInfo {
     /// thumbnail media source.
     pub file: MediaSource,
 
+    /// The number of bytes uploaded for the file.
+    #[serde(default)]
+    pub bytes: usize,
+
     /// Optional thumbnail previously uploaded, when uploading a file.
     ///
     /// When uploading a thumbnail, this is set to `None`.
diff --git a/crates/matrix-sdk-ui/src/timeline/controller/mod.rs b/crates/matrix-sdk-ui/src/timeline/controller/mod.rs
@@ -31,7 +31,7 @@ use matrix_sdk::{
     send_queue::{
         LocalEcho, LocalEchoContent, RoomSendQueueUpdate, SendHandle, SendReactionHandle,
     },
-    Result, Room,
+    Result, Room, TransmissionProgress,
 };
 use ruma::{
     api::client::receipt::create_receipt::v3::ReceiptType as SendReceiptType,
@@ -1322,11 +1322,17 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
                     .await;
             }
 
-            RoomSendQueueUpdate::UploadedMedia { related_to, index, is_thumbnail, .. } => {
+            RoomSendQueueUpdate::UploadedMedia {
+                related_to, bytes, index, is_thumbnail, ..
+            } => {
                 self.update_event_send_state(
                     &related_to,
                     EventSendState::NotSentYet {
-                        progress: Some(EventSendProgress::UploadedMedia { index, is_thumbnail }),
+                        progress: Some(EventSendProgress::MediaUpload {
+                            index,
+                            is_thumbnail,
+                            progress: TransmissionProgress { current: bytes, total: bytes },
+                        }),
                     },
                 )
                 .await;
@@ -1341,7 +1347,7 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
                 self.update_event_send_state(
                     &related_to,
                     EventSendState::NotSentYet {
-                        progress: Some(EventSendProgress::MediaUploadProgress {
+                        progress: Some(EventSendProgress::MediaUpload {
                             index,
                             is_thumbnail,
                             progress,
diff --git a/crates/matrix-sdk-ui/src/timeline/event_item/local.rs b/crates/matrix-sdk-ui/src/timeline/event_item/local.rs
@@ -92,7 +92,7 @@ pub enum EventSendState {
 #[derive(Clone, Debug)]
 pub enum EventSendProgress {
     /// A media is being uploaded.
-    MediaUploadProgress {
+    MediaUpload {
         /// The index of the media within the transaction. A file and its
         /// thumbnail share the same index.
         index: u64,
@@ -103,13 +103,4 @@ pub enum EventSendProgress {
         /// The current upload progress.
         progress: TransmissionProgress,
     },
-
-    /// A media has finished uploading.
-    UploadedMedia {
-        /// The index of the media within the transaction. A file and its
-        /// thumbnail share the same index.
-        index: u64,
-        /// Is the media a thumbnail?
-        is_thumbnail: bool,
-    },
 }
diff --git a/crates/matrix-sdk/src/encryption/futures.rs b/crates/matrix-sdk/src/encryption/futures.rs
@@ -32,7 +32,7 @@ use crate::{config::RequestConfig, Client, Media, Result, TransmissionProgress};
 pub struct UploadEncryptedFile<'a, R: ?Sized> {
     client: &'a Client,
     reader: &'a mut R,
-    send_progress: SharedObservable<TransmissionProgress>,
+    pub(crate) send_progress: SharedObservable<TransmissionProgress>,
     request_config: Option<RequestConfig>,
 }
 
diff --git a/crates/matrix-sdk/src/send_queue/mod.rs b/crates/matrix-sdk/src/send_queue/mod.rs
@@ -643,6 +643,7 @@ impl RoomSendQueue {
                             let _ = updates.send(RoomSendQueueUpdate::UploadedMedia {
                                 related_to: related_txn_id.as_ref().unwrap_or(&txn_id).clone(),
                                 file: media_info.file,
+                                bytes: media_info.bytes,
                                 index,
                                 is_thumbnail,
                             });
@@ -776,6 +777,8 @@ impl RoomSendQueue {
                         ))
                     })?;
 
+                    let bytes;
+
                     #[cfg(feature = "e2e-encryption")]
                     let media_source = if room.latest_encryption_state().await?.is_encrypted() {
                         trace!("upload will be encrypted (encrypted room)");
@@ -789,28 +792,44 @@ impl RoomSendQueue {
                             req = req.with_send_progress_observable(watcher);
                         };
 
+                        let progress = req.send_progress.clone();
                         let encrypted_file = req.await?;
+                        bytes = progress.get().total;
+
                         MediaSource::Encrypted(Box::new(encrypted_file))
                     } else {
                         trace!("upload will be in clear text (room without encryption)");
                         let request_config = RequestConfig::short_retry()
                             .timeout(Media::reasonable_upload_timeout(&data));
                         let mut req =
                             room.client().media().upload(&mime, data, Some(request_config));
+
                         if let Some(watcher) = progress_watcher {
                             req = req.with_send_progress_observable(watcher);
                         };
 
+                        let progress = req.send_progress.clone();
                         let res = req.await?;
+                        bytes = progress.get().total;
+
                         MediaSource::Plain(res.content_uri)
                     };
 
                     #[cfg(not(feature = "e2e-encryption"))]
                     let media_source = {
                         let request_config = RequestConfig::short_retry()
                             .timeout(Media::reasonable_upload_timeout(&data));
-                        let res =
-                            room.client().media().upload(&mime, data, Some(request_config)).await?;
+                        let mut req =
+                            room.client().media().upload(&mime, data, Some(request_config));
+
+                        if let Some(watcher) = progress_watcher {
+                            req = req.with_send_progress_observable(watcher);
+                        };
+
+                        let progress = req.send_progress.clone();
+                        let res = req.await?;
+                        bytes = progress.get().total;
+
                         MediaSource::Plain(res.content_uri)
                     };
 
@@ -825,6 +844,7 @@ impl RoomSendQueue {
                         thumbnail: thumbnail_source,
                         #[cfg(feature = "unstable-msc4274")]
                         accumulated,
+                        bytes,
                     }))
                 };
 
@@ -2137,6 +2157,9 @@ pub enum RoomSendQueueUpdate {
         /// The final media source for the file that was just uploaded.
         file: MediaSource,
 
+        /// The number of bytes uploaded for the file.
+        bytes: usize,
+
         /// The index of the media within the transaction. A file and its
         /// thumbnail share the same index.
         index: u64,

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ use crate::{config::RequestConfig, Client, Media, Result, TransmissionProgress};`
`32`	`32`	`pub struct UploadEncryptedFile<'a, R: ?Sized> {`
`33`	`33`	`client: &'a Client,`
`34`	`34`	`reader: &'a mut R,`
`35`		`- send_progress: SharedObservable<TransmissionProgress>,`
	`35`	`+ pub(crate) send_progress: SharedObservable<TransmissionProgress>,`
`36`	`36`	`request_config: Option<RequestConfig>,`
`37`	`37`	`}`
`38`	`38`