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

base: Expire group sessions if the member list changes.

master
Damir Jelić 2020-05-14 12:59:36 +02:00
parent ecbd801c70
commit c9d38cdedb
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
matrix_sdk_base/src/client.rs
View File

@ -493,7 +493,21 @@ impl BaseClient {
let room_lock = self.get_or_create_joined_room(&room_id).await; let room_lock = self.get_or_create_joined_room(&room_id).await;
let mut room = room_lock.write().await; let mut room = room_lock.write().await;
(decrypted_event, room.receive_timeline_event(&e))
if let RoomEvent::RoomMember(event) = &e {
let changed = room.handle_membership(event);
// The memberlist of the room changed, invalidate the group session
// of the room.
if changed {
#[cfg(feature = "encryption")]
self.invalidate_group_session(room_id).await;
}
(decrypted_event, changed)
} else {
(decrypted_event, room.receive_timeline_event(&e))
}
} }
_ => (None, false), _ => (None, false),
} }
@ -512,7 +526,21 @@ impl BaseClient {
pub async fn receive_joined_state_event(&self, room_id: &RoomId, event: &StateEvent) -> bool { pub async fn receive_joined_state_event(&self, room_id: &RoomId, event: &StateEvent) -> bool {
let room_lock = self.get_or_create_joined_room(room_id).await; let room_lock = self.get_or_create_joined_room(room_id).await;
let mut room = room_lock.write().await; let mut room = room_lock.write().await;
room.receive_state_event(event)
if let StateEvent::RoomMember(e) = event {
let changed = room.handle_membership(e);
// The memberlist of the room changed, invalidate the group session
// of the room.
if changed {
#[cfg(feature = "encryption")]
self.invalidate_group_session(room_id).await;
}
changed
} else {
room.receive_state_event(event)
}
} }
/// Receive a state event for a room the user has been invited to. /// Receive a state event for a room the user has been invited to.