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

fix: Sent events are sorted in SENDING timeline 

Events with a status of 1 should be sorted in the normal timeline.
They should not be stucked at the bottom. This fixes a bug
where a limited timeline flag
can stuck a SENT event at the bottom of
the chat forever.
This commit is contained in:
Christian Pauly 2021-09-29 08:31:11 +02:00 committed by Krille Fear
parent 4bd659fd56
commit 687a6341f1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/src/database/hive_database.dart
View File

@ -895,8 +895,9 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
// Update timeline fragments // Update timeline fragments
final key = final key =
MultiKey(eventUpdate.roomID, status == 2 ? '' : 'SENDING').toString(); MultiKey(eventUpdate.roomID, status >= 1 ? '' : 'SENDING').toString();
final List eventIds = (await _timelineFragmentsBox.get(key) ?? []); final List eventIds = (await _timelineFragmentsBox.get(key) ?? []);
if (!eventIds.contains(eventId)) { if (!eventIds.contains(eventId)) {
if (eventUpdate.type == EventUpdateType.history) { if (eventUpdate.type == EventUpdateType.history) {
eventIds.add(eventId); eventIds.add(eventId);
@ -904,10 +905,16 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
eventIds.insert(0, eventId); eventIds.insert(0, eventId);
} }
await _timelineFragmentsBox.put(key, eventIds); await _timelineFragmentsBox.put(key, eventIds);
} else if (status == 2 &&
prevEvent?.status == 1 &&
eventUpdate.type != EventUpdateType.history) {
// Status changes from 1 -> 2? Make sure event is correctly sorted.
eventIds.remove(eventId);
eventIds.insert(0, eventId);
} }
// If event comes from server timeline, remove sending events with this ID // If event comes from server timeline, remove sending events with this ID
if (status == 2) { if (status >= 1) {
final key = MultiKey(eventUpdate.roomID, 'SENDING').toString(); final key = MultiKey(eventUpdate.roomID, 'SENDING').toString();
final List eventIds = (await _timelineFragmentsBox.get(key) ?? []); final List eventIds = (await _timelineFragmentsBox.get(key) ?? []);
final i = eventIds.indexWhere((id) => id == eventId); final i = eventIds.indexWhere((id) => id == eventId);