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

base: Move the user tracking logic to the correct place.

master
Damir Jelić 2020-05-13 13:10:21 +02:00
parent 5b1188a38b
commit dc56063c67
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
matrix_sdk_base/src/client.rs
View File

@ -654,18 +654,6 @@ impl BaseClient {
// This makes sure that we have the deryption keys for the room
// events at hand.
o.receive_sync_response(response).await;
// TODO once the base client deals with callbacks move this into the
// part where we already iterate through the rooms to avoid yet
// another room loop.
for room in self.joined_rooms.read().await.values() {
let room = room.read().await;
if !room.is_encrypted() {
continue;
}
o.update_tracked_users(room.members.keys()).await;
}
}
}
@ -708,6 +696,20 @@ impl BaseClient {
self.get_or_create_joined_room(&room_id).await.clone()
};
#[cfg(feature = "encryption")]
{
let mut olm = self.olm.lock().await;
if let Some(o) = &mut *olm {
let room = matrix_room.read().await;
// If the room is encrypted, update the tracked users.
if room.is_encrypted() {
o.update_tracked_users(room.members.keys()).await;
}
}
}
// RoomSummary contains information for calculating room name
matrix_room
.write()