char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Simplify the function signature of share_group_session.

master
Damir Jelić 2020-08-20 10:25:05 +02:00
parent a99e47c310
commit ea49a35b43
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
matrix_sdk_crypto/src/machine.rs
View File

@ -761,7 +761,7 @@ impl OlmMachine {
trace!("Successfully decrypted a Olm message: {}", plaintext); trace!("Successfully decrypted a Olm message: {}", plaintext);
Ok(self.parse_decrypted_to_device_event(sender, &plaintext)?) self.parse_decrypted_to_device_event(sender, &plaintext)
} }
/// Parse a decrypted Olm message, check that the plaintext and encrypted /// Parse a decrypted Olm message, check that the plaintext and encrypted
@ -1040,15 +1040,12 @@ impl OlmMachine {
/// used. /// used.
/// ///
/// `users` - The list of users that should receive the group session. /// `users` - The list of users that should receive the group session.
pub async fn share_group_session<S>( pub async fn share_group_session(
&self, &self,
room_id: &RoomId, room_id: &RoomId,
users: impl Iterator<Item = &UserId>, users: impl Iterator<Item = &UserId>,
encryption_settings: S, encryption_settings: impl Into<EncryptionSettings>,
) -> OlmResult<Vec<OwnedToDeviceRequest>> ) -> OlmResult<Vec<OwnedToDeviceRequest>> {
where
S: Into<EncryptionSettings> + Sized,
{
self.create_outbound_group_session(room_id, encryption_settings.into()) self.create_outbound_group_session(room_id, encryption_settings.into())
.await?; .await?;
let session = self.outbound_group_sessions.get(room_id).unwrap(); let session = self.outbound_group_sessions.get(room_id).unwrap();