fixup! sdk: send out the to-device requests created by Room::share_history

Author: richvdh

crates/matrix-sdk-base/src/client.rs

@@ -1135,22 +1135,6 @@ impl BaseClient {
         }
     }
 
-    /// Get to-device requests that will share the details of a room key history
-    /// bundle with a user.
-    #[cfg(feature = "e2e-encryption")]
-    pub async fn share_room_key_bundle_data(
-        &self,
-        user_id: &UserId,
-        bundle_data: RoomKeyBundleContent,
-    ) -> Result<Vec<ToDeviceRequest>> {
-        let olm = self.olm_machine().await;
-        let olm = olm.as_ref().expect("Olm machine wasn't started");
-
-        Ok(olm
-            .share_room_key_bundle_data(user_id, &self.room_key_recipient_strategy, bundle_data)
-            .await?)
-    }
-
     /// Get the room with the given room id.
     ///
     /// # Arguments

crates/matrix-sdk/src/room/shared_room_history.rs

@@ -41,7 +41,7 @@ pub async fn share_room_history(room: &Room, user_id: OwnedUserId) -> Result<()>
     // 2. Upload to the server as an encrypted file
     let json = serde_json::to_vec(&bundle)?;
     let upload =
-        room.client.upload_encrypted_file(&mime::APPLICATION_JSON, &mut (json.as_slice())).await?;
+        client.upload_encrypted_file(&mime::APPLICATION_JSON, &mut (json.as_slice())).await?;
 
     tracing::info!(
         media_url = ?upload.url,
@@ -54,13 +54,18 @@ pub async fn share_room_history(room: &Room, user_id: OwnedUserId) -> Result<()>
     client.claim_one_time_keys(iter::once(user_id.as_ref())).await?;
 
     // 4. Send to-device messages to the recipient to share the keys.
-    let requests = client
-        .base_client()
-        .share_room_key_bundle_data(
-            &user_id,
-            RoomKeyBundleContent { room_id: room.room_id().to_owned(), file: upload },
-        )
-        .await?;
+    let content = RoomKeyBundleContent { room_id: room.room_id().to_owned(), file: upload };
+    let requests = {
+        let olm_machine = client.olm_machine().await;
+        let olm_machine = olm_machine.as_ref().ok_or(Error::NoOlmMachine)?;
+        olm_machine
+            .share_room_key_bundle_data(
+                &user_id,
+                &client.base_client().room_key_recipient_strategy,
+                content,
+            )
+            .await?
+    };
 
     for request in requests {
         let response = client.send_to_device(&request).await?;