1 files changed, 26 insertions, 24 deletions

diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index 235b2aa4..e24e5745 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -1,10 +1,17 @@
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #pragma once
 
-#include "e2ee.h"
 #include "roomevent.h"
 
 namespace Quotient {
-class Room;
+
+constexpr auto CiphertextKeyL = "ciphertext"_ls;
+constexpr auto SenderKeyKeyL = "sender_key"_ls;
+constexpr auto DeviceIdKeyL = "device_id"_ls;
+constexpr auto SessionIdKeyL = "session_id"_ls;
+
 /*
  * While the specification states:
  *
@@ -23,44 +30,39 @@ class Room;
  * in general. It's possible, because RoomEvent interface is similar to Event's
  * one and doesn't add new restrictions, just provides additional features.
  */
-class EncryptedEvent : public RoomEvent {
-    Q_GADGET
+class QUOTIENT_API EncryptedEvent : public RoomEvent {
 public:
-    DEFINE_EVENT_TYPEID("m.room.encrypted", EncryptedEvent)
+    QUO_EVENT(EncryptedEvent, "m.room.encrypted")
 
     /* In case with Olm, the encrypted content of the event is
      * a map from the recipient Curve25519 identity key to ciphertext
      * information */
-    explicit EncryptedEvent(const QJsonObject& ciphertext,
+    explicit EncryptedEvent(const QJsonObject& ciphertexts,
                             const QString& senderKey);
     /* In case with Megolm, device_id and session_id are required */
-    explicit EncryptedEvent(QByteArray ciphertext, const QString& senderKey,
-                            const QString& deviceId, const QString& sessionId);
+    explicit EncryptedEvent(const QByteArray& ciphertext,
+                            const QString& senderKey, const QString& deviceId,
+                            const QString& sessionId);
     explicit EncryptedEvent(const QJsonObject& obj);
 
-    QString algorithm() const
-    {
-        QString algo = content<QString>(AlgorithmKeyL);
-        if (!SupportedAlgorithms.contains(algo)) {
-            qWarning(MAIN) << "The EncryptedEvent's algorithm" << algo
-                           << "is not supported";
-        }
-        return algo;
-    }
+    QString algorithm() const;
     QByteArray ciphertext() const
     {
-        return content<QString>(CiphertextKeyL).toLatin1();
+        return contentPart<QString>(CiphertextKeyL).toLatin1();
     }
     QJsonObject ciphertext(const QString& identityKey) const
     {
-        return content<QJsonObject>(CiphertextKeyL).value(identityKey).toObject();
+        return contentPart<QJsonObject>(CiphertextKeyL)
+            .value(identityKey)
+            .toObject();
     }
-    QString senderKey() const { return content<QString>(SenderKeyKeyL); }
+    QString senderKey() const { return contentPart<QString>(SenderKeyKeyL); }
 
     /* device_id and session_id are required with Megolm */
-    QString deviceId() const { return content<QString>(DeviceIdKeyL); }
-    QString sessionId() const { return content<QString>(SessionIdKeyL); }
-};
-REGISTER_EVENT_TYPE(EncryptedEvent)
+    QString deviceId() const { return contentPart<QString>(DeviceIdKeyL); }
+    QString sessionId() const { return contentPart<QString>(SessionIdKeyL); }
+    RoomEventPtr createDecrypted(const QString &decrypted) const;
 
+    void setRelation(const QJsonObject& relation);
+};
 } // namespace Quotient