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

crytpo: Change the share_group_session method to always create a new session.

master
Damir Jelić 2020-04-10 11:45:50 +02:00
parent 1504b3a02a
commit 0a2b66de9a
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base_client.rs
View File

@ -442,7 +442,7 @@ impl Client {
Some(o) => { Some(o) => {
let room = room.lock().await; let room = room.lock().await;
let members = room.members.keys(); let members = room.members.keys();
Ok(o.share_megolm_session(room_id, members).await?) Ok(o.share_group_session(room_id, members).await?)
} }
None => panic!("Olm machine wasn't started"), None => panic!("Olm machine wasn't started"),
} }

14
src/crypto/machine.rs
View File

@ -920,7 +920,7 @@ impl OlmMachine {
} }
// TODO accept an algorithm here // TODO accept an algorithm here
pub(crate) async fn share_megolm_session<'a, I>( pub(crate) async fn share_group_session<'a, I>(
&mut self, &mut self,
room_id: &RoomId, room_id: &RoomId,
users: I, users: I,
@ -928,18 +928,8 @@ impl OlmMachine {
where where
I: IntoIterator<Item = &'a UserId>, I: IntoIterator<Item = &'a UserId>,
{ {
if !self.outbound_group_session.contains_key(room_id) {
self.create_outbound_group_session(room_id).await?
}
let megolm_session = self.outbound_group_session.get(room_id).unwrap();
let megolm_session = if megolm_session.expired() {
self.create_outbound_group_session(room_id).await?; self.create_outbound_group_session(room_id).await?;
self.outbound_group_session.get(room_id).unwrap() let megolm_session = self.outbound_group_session.get(room_id).unwrap();
} else {
megolm_session
};
if megolm_session.shared() { if megolm_session.shared() {
panic!("Session is already shared"); panic!("Session is already shared");