OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'krille/limited-timeline-behavior' into 'main' 

fix: Limited timeline clears too much events

Closes #217

See merge request famedly/company/frontend/famedlysdk!907
This commit is contained in:
Nicolas Werner 2021-11-23 15:06:29 +00:00
parent da57be44e4 9cbe1099e5
commit 64257735ac
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/timeline.dart
View File

@ -120,13 +120,12 @@ class Timeline {
this.onRemove, this.onRemove,
}) : events = events ?? [] { }) : events = events ?? [] {
sub = room.client.onEvent.stream.listen(_handleEventUpdate); sub = room.client.onEvent.stream.listen(_handleEventUpdate);
// If the timeline is limited we want to clear our events cache // If the timeline is limited we want to clear our events cache
roomSub = room.client.onSync.stream roomSub = room.client.onSync.stream
.where((sync) => sync.rooms?.join?[room.id]?.timeline?.limited == true) .where((sync) => sync.rooms?.join?[room.id]?.timeline?.limited == true)
.listen((_) { .listen(_removeEventsNotInThisSync);
this.events.clear();
aggregatedEvents.clear();
});
sessionIdReceivedSub = sessionIdReceivedSub =
room.onSessionKeyReceived.stream.listen(_sessionKeyReceived); room.onSessionKeyReceived.stream.listen(_sessionKeyReceived);
@ -136,6 +135,13 @@ class Timeline {
} }
} }
/// Removes all entries from [events] which are not in this SyncUpdate.
void _removeEventsNotInThisSync(SyncUpdate sync) {
final newSyncEvents = sync.rooms?.join?[room.id]?.timeline?.events ?? [];
final keepEventIds = newSyncEvents.map((e) => e.eventId);
events.removeWhere((e) => !keepEventIds.contains(e.eventId));
}
/// Don't forget to call this before you dismiss this object! /// Don't forget to call this before you dismiss this object!
void cancelSubscriptions() { void cancelSubscriptions() {
sub?.cancel(); sub?.cancel();