Merge branch 'master' into use-clang-format

1 files changed, 32 insertions, 0 deletions

diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp
new file mode 100644
index 00000000..dac245fa
--- /dev/null
+++ b/lib/events/encryptedevent.cpp
@@ -0,0 +1,32 @@
+#include "encryptedevent.h"
+
+#include "room.h"
+
+using namespace QMatrixClient;
+using namespace QtOlm;
+
+EncryptedEvent::EncryptedEvent(const QJsonObject& ciphertext,
+                               const QString& senderKey)
+    : RoomEvent(typeId(), matrixTypeId(),
+                { { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey },
+                  { CiphertextKeyL, ciphertext },
+                  { SenderKeyKeyL, senderKey } })
+{}
+
+EncryptedEvent::EncryptedEvent(QByteArray ciphertext, const QString& senderKey,
+                               const QString& deviceId, const QString& sessionId)
+    : RoomEvent(typeId(), matrixTypeId(),
+                {
+                    { AlgorithmKeyL, MegolmV1AesSha2AlgoKey },
+                    { CiphertextKeyL, QString(ciphertext) },
+                    { DeviceIdKeyL, deviceId },
+                    { SenderKeyKeyL, senderKey },
+                    { SessionIdKeyL, sessionId },
+                })
+{}
+
+EncryptedEvent::EncryptedEvent(const QJsonObject& obj)
+    : RoomEvent(typeId(), obj)
+{
+    qCDebug(EVENTS) << "Encrypted event" << id();
+}