inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into soru/cross-signing

Browse source
This commit is contained in:
Sorunome 2020-05-26 10:00:59 +02:00
parent 2ecf4151b9 ad5b02e0ef
commit c23e38a9c9
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/event.dart
View file

@ -428,10 +428,10 @@ class Event {
/// Trys to decrypt this event and persists it in the database afterwards /// Trys to decrypt this event and persists it in the database afterwards
Future<Event> decryptAndStore([String updateType = 'timeline']) async { Future<Event> decryptAndStore([String updateType = 'timeline']) async {
final newEvent = decrypted; final newEvent = decrypted;
if (newEvent.type == EventTypes.Encrypted || room.client.database == null) { if (newEvent.type == EventTypes.Encrypted) {
return newEvent; // decryption failed or we don't have a database return newEvent; // decryption failed
} }
await room.client.database.storeEventUpdate( await room.client.database?.storeEventUpdate(
room.client.id, room.client.id,
EventUpdate( EventUpdate(
eventType: newEvent.typeKey, eventType: newEvent.typeKey,
@ -441,6 +441,9 @@ class Event {
sortOrder: newEvent.sortOrder, sortOrder: newEvent.sortOrder,
), ),
); );
if (updateType != 'history') {
room.setState(newEvent);
}
return newEvent; return newEvent;
} }

19
lib/src/room.dart
View file

@ -273,10 +273,7 @@ class Room {
Future<void> _tryAgainDecryptLastMessage() async { Future<void> _tryAgainDecryptLastMessage() async {
if (getState('m.room.encrypted') != null) { if (getState('m.room.encrypted') != null) {
final decrypted = await getState('m.room.encrypted').decryptAndStore(); await getState('m.room.encrypted').decryptAndStore();
if (decrypted.type != EventTypes.Encrypted) {
setState(decrypted);
}
} }
} }
@ -405,14 +402,22 @@ class Room {
String notificationSettings; String notificationSettings;
Event get lastEvent { Event get lastEvent {
var lastSortOrder = -1e32; // this bound to be small enough // as lastEvent calculation is based on the state events we unfortunately cannot
// use sortOrder here: With many state events we just know which ones are the
// newest ones, without knowing in which order they actually happened. As such,
// using the origin_server_ts is the best guess for this algorithm. While not
// perfect, it is only used for the room preview in the room list and sorting
// said room list, so it should be good enough.
var lastTime = DateTime.fromMillisecondsSinceEpoch(0);
var lastEvent = getState('m.room.message'); var lastEvent = getState('m.room.message');
if (lastEvent == null) { if (lastEvent == null) {
states.forEach((final String key, final entry) { states.forEach((final String key, final entry) {
if (!entry.containsKey('')) return; if (!entry.containsKey('')) return;
final Event state = entry['']; final Event state = entry[''];
if (state.sortOrder != null && state.sortOrder > lastSortOrder) { if (state.time != null &&
lastSortOrder = state.sortOrder; state.time.millisecondsSinceEpoch >
lastTime.millisecondsSinceEpoch) {
lastTime = state.time;
lastEvent = state; lastEvent = state;
} }
}); });

4
lib/src/utils/profile.dart
View file

@ -19,5 +19,7 @@ class Profile {
@override @override
bool operator ==(dynamic other) => bool operator ==(dynamic other) =>
avatarUrl == other.avatarUrl && displayname == other.displayname; (other is Profile) &&
avatarUrl == other.avatarUrl &&
displayname == other.displayname;
} }