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

Merge pull request #1989 from famedly/krille/follow-up-store-utd-events 

chore: Follow up store unable to decrypt information correctly
This commit is contained in:
Krille-chan 2024-12-31 13:40:41 +01:00 committed by GitHub
parent d89c8a3b54 632ecbed7e
commit 0caec7ca17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/client.dart
View File

@ -2755,14 +2755,12 @@ class Client extends MatrixApi {
if (event is MatrixEvent && if (event is MatrixEvent &&
event.type == EventTypes.Encrypted && event.type == EventTypes.Encrypted &&
encryptionEnabled) { encryptionEnabled) {
final decrypted = await encryption!.decryptRoomEvent( event = await encryption!.decryptRoomEvent(
Event.fromMatrixEvent(event, room), Event.fromMatrixEvent(event, room),
updateType: type, updateType: type,
); );
if (decrypted.type != EventTypes.Encrypted) { if (event.type == EventTypes.Encrypted) {
event = decrypted;
} else {
// if the event failed to decrypt, add it to the queue // if the event failed to decrypt, add it to the queue
_eventsPendingDecryption.add( _eventsPendingDecryption.add(
_EventPendingDecryption(Event.fromMatrixEvent(event, room)), _EventPendingDecryption(Event.fromMatrixEvent(event, room)),

33
lib/src/event.dart
View File

@ -163,20 +163,27 @@ class Event extends MatrixEvent {
factory Event.fromMatrixEvent( factory Event.fromMatrixEvent(
MatrixEvent matrixEvent, MatrixEvent matrixEvent,
Room room, { Room room, {
EventStatus status = defaultStatus, EventStatus? status,
}) => }) =>
Event( matrixEvent is Event
status: status, ? matrixEvent
content: matrixEvent.content, : Event(
type: matrixEvent.type, status: status ??
eventId: matrixEvent.eventId, eventStatusFromInt(
senderId: matrixEvent.senderId, matrixEvent.unsigned
originServerTs: matrixEvent.originServerTs, ?.tryGet<int>('messageSendingStatusKey') ??
unsigned: matrixEvent.unsigned, defaultStatus.intValue,
prevContent: matrixEvent.prevContent, ),
stateKey: matrixEvent.stateKey, content: matrixEvent.content,
room: room, type: matrixEvent.type,
); eventId: matrixEvent.eventId,
senderId: matrixEvent.senderId,
originServerTs: matrixEvent.originServerTs,
unsigned: matrixEvent.unsigned,
prevContent: matrixEvent.prevContent,
stateKey: matrixEvent.stateKey,
room: room,
);
/// Get a State event from a table row or from the event stream. /// Get a State event from a table row or from the event stream.
factory Event.fromJson( factory Event.fromJson(