Connection::Private::assembleEncryptedContent()

What was partially factored out before into encryptSessionKeyEvent()
is now the complete algorithm converting any event json into encrypted
content.

2 files changed, 10 insertions, 14 deletions

diff --git a/lib/events/roomkeyevent.cpp b/lib/events/roomkeyevent.cpp
index 68962950..3a8601d1 100644
--- a/lib/events/roomkeyevent.cpp
+++ b/lib/events/roomkeyevent.cpp
@@ -5,21 +5,18 @@
 
 using namespace Quotient;
 
-RoomKeyEvent::RoomKeyEvent(const QJsonObject &obj) : Event(typeId(), obj)
+RoomKeyEvent::RoomKeyEvent(const QJsonObject &obj) : Event(TypeId, obj)
 {
     if (roomId().isEmpty())
         qCWarning(E2EE) << "Room key event has empty room id";
 }
 
-RoomKeyEvent::RoomKeyEvent(const QString& algorithm, const QString& roomId, const QString& sessionId, const QString& sessionKey, const QString& senderId)
-    : Event(typeId(), {
-        {"content", QJsonObject{
-            {"algorithm", algorithm},
-            {"room_id", roomId},
-            {"session_id", sessionId},
-            {"session_key", sessionKey},
-        }},
-        {"sender", senderId},
-        {"type", "m.room_key"},
-    })
+RoomKeyEvent::RoomKeyEvent(const QString& algorithm, const QString& roomId,
+                           const QString& sessionId, const QString& sessionKey)
+    : Event(TypeId, basicJson(TypeId, {
+                                          { "algorithm", algorithm },
+                                          { "room_id", roomId },
+                                          { "session_id", sessionId },
+                                          { "session_key", sessionKey },
+                                      }))
 {}
diff --git a/lib/events/roomkeyevent.h b/lib/events/roomkeyevent.h
index 9eb2854b..0dfdf383 100644
--- a/lib/events/roomkeyevent.h
+++ b/lib/events/roomkeyevent.h
@@ -13,8 +13,7 @@ public:
 
     explicit RoomKeyEvent(const QJsonObject& obj);
     explicit RoomKeyEvent(const QString& algorithm, const QString& roomId,
-                          const QString& sessionId, const QString& sessionKey,
-                          const QString& senderId);
+                          const QString& sessionId, const QString& sessionKey);
 
     QUO_CONTENT_GETTER(QString, algorithm)
     QUO_CONTENT_GETTER(QString, roomId)