diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-09-26 13:52:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 13:52:22 +0200 |
| commit | 15b840d82d4794358fbf1271ea76e446b47db7e5 (patch) | |
| tree | aa5fdaa81234a21c6919fac4958f84d7c26cd397 /lib/events | |
| parent | 72e14cb1bdff68dfe0fb61fff0defd6c50dff43c (diff) | |
| parent | 5904a61c59f0eef00aef07ef998658fd791ff139 (diff) | |
| download | libquotient-15b840d82d4794358fbf1271ea76e446b47db7e5.tar.gz libquotient-15b840d82d4794358fbf1271ea76e446b47db7e5.zip | |
Merge branch 'dev' into kitsune/unify-olm-errors
Diffstat (limited to 'lib/events')
| -rw-r--r-- | lib/events/encryptedevent.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp index 114addb5..540594d1 100644 --- a/lib/events/encryptedevent.cpp +++ b/lib/events/encryptedevent.cpp @@ -9,21 +9,19 @@ using namespace Quotient; EncryptedEvent::EncryptedEvent(const QJsonObject& ciphertexts, const QString& senderKey) - : RoomEvent({ { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey }, - { CiphertextKeyL, ciphertexts }, - { SenderKeyKeyL, senderKey } }) + : RoomEvent(basicJson(TypeId, { { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey }, + { CiphertextKeyL, ciphertexts }, + { SenderKeyKeyL, senderKey } })) {} EncryptedEvent::EncryptedEvent(const QByteArray& ciphertext, const QString& senderKey, const QString& deviceId, const QString& sessionId) - : RoomEvent({ - { AlgorithmKeyL, MegolmV1AesSha2AlgoKey }, - { CiphertextKeyL, QString(ciphertext) }, - { DeviceIdKeyL, deviceId }, - { SenderKeyKeyL, senderKey }, - { SessionIdKeyL, sessionId }, - }) + : RoomEvent(basicJson(TypeId, { { AlgorithmKeyL, MegolmV1AesSha2AlgoKey }, + { CiphertextKeyL, QString(ciphertext) }, + { DeviceIdKeyL, deviceId }, + { SenderKeyKeyL, senderKey }, + { SessionIdKeyL, sessionId } })) {} EncryptedEvent::EncryptedEvent(const QJsonObject& obj) |