mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 05:30:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(sdk): Change how SlidingSyncList::update_room_list handles updates for out of list rooms

Browse Source 
fix(sdk): Change how `SlidingSyncList::update_room_list` handles updates for out of list rooms
This commit is contained in:
Ivan Enderlin
2023-06-29 15:48:39 +02:00
committed by GitHub
parent 91bf84714d 9bae039629
commit 1958df22a9
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
crates/matrix-sdk/src/sliding_sync/list/mod.rs
View File

@@ -455,41 +455,28 @@ impl SlidingSyncListInner {
// user to know if a room has received an update: be either a
// position modification or an update in general (like a new room
// message). Let's trigger those.
let request_generator = self.request_generator.read().unwrap();
// Note: this is fine to call `request_generator` here because we've handled the
// response in the generator first.
let ranges = request_generator.requested_ranges();
let mut rooms_to_update = Vec::with_capacity(rooms_that_have_received_an_update.len());
for (start, end) in ranges
.iter()
.map(|r| (usize::try_from(*r.start()).unwrap(), usize::try_from(*r.end()).unwrap()))
{
let mut rooms_to_update =
Vec::with_capacity(rooms_that_have_received_an_update.len());
for (position, room_list_entry) in
room_list.iter().enumerate().skip(start).take(end.saturating_add(1))
{
// Invalidated rooms must be considered as empty rooms, so let's just filter by
// filled rooms.
if let RoomListEntry::Filled(room_id) = room_list_entry {
// If room has received an update but that has not been handled by a
// sync operation.
if rooms_that_have_received_an_update.contains(room_id) {
rooms_to_update.push((position, room_list_entry.clone()));
}
for (position, room_list_entry) in room_list.iter().enumerate() {
// Invalidated rooms must be considered as empty rooms, so let's just filter by
// filled rooms.
if let RoomListEntry::Filled(room_id) = room_list_entry {
// If room has received an update but that has not been handled by a
// sync operation.
if rooms_that_have_received_an_update.contains(room_id) {
rooms_to_update.push((position, room_list_entry.clone()));
}
}
}
if !rooms_to_update.is_empty() {
for (position, room_list_entry) in rooms_to_update {
// Setting to `room_list`'s item to the same value, just
// to generate an “diff update”.
room_list.set(position, room_list_entry);
}
new_changes = true;
if !rooms_to_update.is_empty() {
for (position, room_list_entry) in rooms_to_update {
// Setting to `room_list`'s item to the same value, just
// to generate an “diff update”.
room_list.set(position, room_list_entry);
}
new_changes = true;
}
}

1
crates/matrix-sdk/src/sliding_sync/list/request_generator.rs
View File

@@ -120,6 +120,7 @@ impl SlidingSyncListRequestGenerator {
/// For generators in the selective mode, this is the initial set of ranges.
/// For growing and paginated generators, this is the range committed in the
/// latest response received from the server.
#[cfg(test)]
pub(super) fn requested_ranges(&self) -> &[Range] {
&self.ranges
}