diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-07-12 14:56:20 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-07-12 14:56:20 +0200 |
| commit | 73167a23212541ff6aeaeb901d7dfe636badc6e8 (patch) | |
| tree | f889b50746fd393d005552cd6c3580449fc78166 /lib/room.cpp | |
| parent | 607489a2e6a3e3238eac0178f5c7bbc70f178f46 (diff) | |
| parent | e7dee15531ad357bd33ac546fb1b9332a5c1260c (diff) | |
| download | libquotient-73167a23212541ff6aeaeb901d7dfe636badc6e8.tar.gz libquotient-73167a23212541ff6aeaeb901d7dfe636badc6e8.zip | |
Merge branch 'kitsune/converters-upgrade' into dev
Diffstat (limited to 'lib/room.cpp')
| -rw-r--r-- | lib/room.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/room.cpp b/lib/room.cpp index 2625105c..f67451ce 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -3062,7 +3062,7 @@ Room::Changes Room::processStateEvent(const RoomEvent& e) return false; } if (oldEncEvt - && oldEncEvt->encryption() != EncryptionEventContent::Undefined) { + && oldEncEvt->encryption() != EncryptionType::Undefined) { qCWarning(STATE) << "The room is already encrypted but a new" " room encryption event arrived - ignoring"; return false; @@ -3508,5 +3508,5 @@ void Room::activateEncryption() qCWarning(E2EE) << "Room" << objectName() << "is already encrypted"; return; } - setState<EncryptionEvent>(EncryptionEventContent::MegolmV1AesSha2); + setState<EncryptionEvent>(EncryptionType::MegolmV1AesSha2); } |