chore(send_queue): Make parent_is_thumbnail_upload available outside of unstable-msc4274 to use it during media progress reporting later

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>

Author: Johennes

crates/matrix-sdk-base/src/store/send_queue.rs

@@ -238,7 +238,6 @@ pub enum DependentQueuedRequestKind {
         related_to: OwnedTransactionId,
 
         /// Whether the depended upon request was a thumbnail or a file upload.
-        #[cfg(feature = "unstable-msc4274")]
         #[serde(default = "default_parent_is_thumbnail_upload")]
         parent_is_thumbnail_upload: bool,
     },
@@ -275,7 +274,6 @@ pub enum DependentQueuedRequestKind {
 /// If parent_is_thumbnail_upload is missing, we assume the request is for a
 /// file upload following a thumbnail upload. This was the only possible case
 /// before parent_is_thumbnail_upload was introduced.
-#[cfg(feature = "unstable-msc4274")]
 fn default_parent_is_thumbnail_upload() -> bool {
     true
 }

crates/matrix-sdk/src/send_queue/mod.rs

@@ -1467,7 +1467,6 @@ impl QueueStorage {
                         content_type: content_type.to_string(),
                         cache_key: file_media_request,
                         related_to: send_event_txn,
-                        #[cfg(feature = "unstable-msc4274")]
                         parent_is_thumbnail_upload: true,
                     },
                 )
@@ -1859,25 +1858,12 @@ impl QueueStorage {
                 content_type,
                 cache_key,
                 related_to,
-                #[cfg(feature = "unstable-msc4274")]
                 parent_is_thumbnail_upload,
             } => {
                 let Some(parent_key) = parent_key else {
                     // Not finished yet, we should retry later => false.
                     return Ok(false);
                 };
-                let parent_is_thumbnail_upload = {
-                    cfg_if::cfg_if! {
-                        if #[cfg(feature = "unstable-msc4274")] {
-                            parent_is_thumbnail_upload
-                        } else {
-                            // Before parent_is_thumbnail_upload was introduced, the only
-                            // possible usage for this request was a file upload following
-                            // a thumbnail upload.
-                            true
-                        }
-                    }
-                };
                 self.handle_dependent_file_or_thumbnail_upload(
                     client,
                     dependent_request.own_transaction_id.into(),