Merge branch 'krille/search-method-fix' into 'main'

fix: Request key in searchEvent method crashes because of wrong preconditions

See merge request famedly/company/frontend/famedlysdk!1239
This commit is contained in:
Nicolas Werner 2023-02-14 10:05:53 +00:00
commit 468a918b3a
1 changed files with 2 additions and 2 deletions

View File

@ -599,8 +599,8 @@ class Timeline {
var event = Event.fromMatrixEvent(matrixEvent, room); var event = Event.fromMatrixEvent(matrixEvent, room);
if (event.type == EventTypes.Encrypted && encryption != null) { if (event.type == EventTypes.Encrypted && encryption != null) {
event = await encryption.decryptRoomEvent(room.id, event); event = await encryption.decryptRoomEvent(room.id, event);
if (event.type == EventTypes.Encrypted || if (event.type == EventTypes.Encrypted &&
event.messageType == MessageTypes.BadEncrypted || event.messageType == MessageTypes.BadEncrypted &&
event.content['can_request_session'] == true) { event.content['can_request_session'] == true) {
// Await requestKey() here to ensure decrypted message bodies // Await requestKey() here to ensure decrypted message bodies
await event.requestKey(); await event.requestKey();