atagen

matrix-rust-sdk

public
Star0
Fork0
Watch0
2 commits4 branches0 tags0 releases16.6 MiB

Commit 0ee5a5a345ee

tarball

atagen <boss@atagen.co>2026-10-22 12:30 UTC

2 files changed+19-3
room: expose prepare_encryption so a room key can be shared before the send
crates/matrix-sdk/src/room/futures.rs+1−1
@@ -520,7 +520,7 @@ impl<'a> IntoFuture for SendStateEvent<'a> {
520520
521521 /// Ensures the room is ready for encrypted events to be sent.
522522 #[cfg(feature = "e2e-encryption")]
523-async fn ensure_room_encryption_ready(room: &Room) -> Result<()> {
523+pub(super) async fn ensure_room_encryption_ready(room: &Room) -> Result<()> {
524524 if !room.are_members_synced() {
525525 room.sync_members().await?;
526526 }
crates/matrix-sdk/src/room/mod.rs+18−2
@@ -2383,14 +2383,30 @@ impl Room {
23832383 self.enable_encryption_inner(true).await
23842384 }
23852385
2386+ /// Get this room ready for sending an encrypted event, ahead of the send.
2387+ ///
2388+ /// Syncs the members if needed, queries the keys of untracked or dirty
2389+ /// members, claims one-time keys and shares the room key. That's the work
2390+ /// sending an encrypted event would otherwise do before the event goes
2391+ /// out, so calling this when the user starts typing takes it off the send.
2392+ ///
2393+ /// Does nothing if the room isn't encrypted or no room key needs to be
2394+ /// shared. A send racing it waits for the share rather than doing it twice.
2395+ #[cfg(feature = "e2e-encryption")]
2396+ #[instrument(skip_all, fields(room_id = ?self.room_id()))]
2397+ pub async fn prepare_encryption(&self) -> Result<()> {
2398+ if self.latest_encryption_state().await?.is_encrypted() {
2399+ futures::ensure_room_encryption_ready(self).await?;
2400+ }
2401+ Ok(())
2402+ }
2403+
23862404 /// Share a room key with users in the given room.
23872405 ///
23882406 /// This will create Olm sessions with all the users/device pairs in the
23892407 /// room if necessary and share a room key that can be shared with them.
23902408 ///
23912409 /// Does nothing if no room key needs to be shared.
2392- // TODO: expose this publicly so people can pre-share a group session if
2393- // e.g. a user starts to type a message for a room.
23942410 #[cfg(feature = "e2e-encryption")]
23952411 #[instrument(skip_all, fields(room_id = ?self.room_id()))]
23962412 async fn preshare_room_key(&self) -> Result<()> {