3 files changed, 131 insertions, 2 deletions
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
new file mode 100644
index 00000000..b8e2b575
--- /dev/null
+++ b/lib/events/encryptionevent.cpp
@@ -0,0 +1,53 @@
+//
+// Created by rusakov on 26/09/2017.
+// Contributed by andreev on 27/06/2019.
+//
+
+#include "encryptionevent.h"
+
+#include "converters.h"
+#include "logging.h"
+
+#include <array>
+
+static const std::array<QString, 1> encryptionStrings = { {
+    QStringLiteral("m.megolm.v1.aes-sha2")
+} };
+
+namespace QMatrixClient {
+    template <>
+    struct JsonConverter<EncryptionType>
+    {
+        static EncryptionType load(const QJsonValue& jv)
+        {
+            const auto& encryptionString = jv.toString();
+            for (auto it = encryptionStrings.begin();
+                    it != encryptionStrings.end(); ++it)
+                if (encryptionString == *it)
+                    return EncryptionType(it - encryptionStrings.begin());
+
+            qCWarning(EVENTS) << "Unknown EncryptionType: " << encryptionString;
+            return EncryptionType::Undefined;
+        }
+    };
+}
+
+using namespace QMatrixClient;
+
+EncryptionEventContent::EncryptionEventContent(const QJsonObject& json)
+    : encryption(fromJson<EncryptionType>(json["algorithm"_ls]))
+    , algorithm(sanitized(json["algorithm"_ls].toString()))
+    , rotationPeriodMs(json["rotation_period_ms"_ls].toInt(604800000))
+    , rotationPeriodMsgs(json["rotation_period_msgs"_ls].toInt(100))
+{ }
+
+void EncryptionEventContent::fillJson(QJsonObject* o) const
+{
+    Q_ASSERT(o);
+    Q_ASSERT_X(encryption != EncryptionType::Undefined, __FUNCTION__,
+             "The key 'algorithm' must be explicit in EncryptionEventContent");
+    if (encryption != EncryptionType::Undefined)
+        o->insert(QStringLiteral("algorithm"), algorithm);
+    o->insert(QStringLiteral("rotation_period_ms"), rotationPeriodMs);
+    o->insert(QStringLiteral("rotation_period_msgs"), rotationPeriodMsgs);
+}
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
new file mode 100644
index 00000000..b9e108f0
--- /dev/null
+++ b/lib/events/encryptionevent.h
@@ -0,0 +1,78 @@
+/******************************************************************************
+ * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include "stateevent.h"
+#include "eventcontent.h"
+
+namespace QMatrixClient
+{
+    class EncryptionEventContent: public EventContent::Base
+    {
+        public:
+            enum EncryptionType : size_t { MegolmV1AesSha2 = 0,
+                                           Undefined };
+
+            explicit EncryptionEventContent(EncryptionType et = Undefined)
+                : encryption(et)
+            { }
+            explicit EncryptionEventContent(const QJsonObject& json);
+
+            EncryptionType encryption;
+            QString algorithm;
+            int rotationPeriodMs;
+            int rotationPeriodMsgs;
+
+        protected:
+            void fillJson(QJsonObject* o) const override;
+    };
+
+    using EncryptionType = EncryptionEventContent::EncryptionType;
+
+    class EncryptionEvent : public StateEvent<EncryptionEventContent>
+    {
+            Q_GADGET
+        public:
+            DEFINE_EVENT_TYPEID("m.room.encryption", EncryptionEvent)
+
+            using EncryptionType = EncryptionEventContent::EncryptionType;
+
+            explicit EncryptionEvent(const QJsonObject& obj = {}) // TODO: apropriate default value
+                : StateEvent(typeId(), obj)
+            { }
+            template <typename... ArgTs>
+            EncryptionEvent(ArgTs&&... contentArgs)
+                : StateEvent(typeId(), matrixTypeId(), QString(),
+                             std::forward<ArgTs>(contentArgs)...)
+            { }
+
+            EncryptionType encryption() const  { return content().encryption; }
+
+            QString algorithm() const { return content().algorithm; }
+            int rotationPeriodMs() const { return content().rotationPeriodMs; }
+            int rotationPeriodMsgs() const { return content().rotationPeriodMsgs; }
+
+        private:
+            REGISTER_ENUM(EncryptionType)
+    };
+
+    REGISTER_EVENT_TYPE(EncryptionEvent)
+    DEFINE_EVENTTYPE_ALIAS(Encryption, EncryptionEvent)
+}  // namespace QMatrixClient
+
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index dc6a0868..ef56c7b2 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -81,8 +81,6 @@ namespace QMatrixClient
     DEFINE_EVENTTYPE_ALIAS(RoomCanonicalAlias, RoomCanonicalAliasEvent)
     DEFINE_SIMPLE_STATE_EVENT(RoomTopicEvent, "m.room.topic", QString, topic)
     DEFINE_EVENTTYPE_ALIAS(RoomTopic, RoomTopicEvent)
-    DEFINE_SIMPLE_STATE_EVENT(EncryptionEvent, "m.room.encryption",
-                              QString, algorithm)
     DEFINE_EVENTTYPE_ALIAS(RoomEncryption, EncryptionEvent)
 
     class RoomAliasesEvent