Merge pull request #506 from TobiasFella/activateencryption

Add convenience function for activating encryption

4 files changed, 24 insertions, 3 deletions

diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 490a5e8a..aa05a96e 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -39,6 +39,14 @@ EncryptionEventContent::EncryptionEventContent(const QJsonObject& json)
     , rotationPeriodMsgs(json[RotationPeriodMsgsKeyL].toInt(100))
 {}
 
+EncryptionEventContent::EncryptionEventContent(EncryptionType et)
+    : encryption(et)
+{
+    if(encryption != Undefined) {
+        algorithm = encryptionStrings[encryption];
+    }
+}
+
 void EncryptionEventContent::fillJson(QJsonObject* o) const
 {
     Q_ASSERT(o);
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 65ee4187..14439fcc 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -12,9 +12,7 @@ class EncryptionEventContent : public EventContent::Base {
 public:
     enum EncryptionType : size_t { MegolmV1AesSha2 = 0, Undefined };
 
-    explicit EncryptionEventContent(EncryptionType et = Undefined)
-        : encryption(et)
-    {}
+    explicit EncryptionEventContent(EncryptionType et = Undefined);
     explicit EncryptionEventContent(const QJsonObject& json);
 
     EncryptionType encryption;
diff --git a/lib/room.cpp b/lib/room.cpp
index bcbb121b..fb65fd84 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -3020,3 +3020,12 @@ bool MemberSorter::operator()(User* u1, QStringView u2name) const
 
     return n1.localeAwareCompare(n2) < 0;
 }
+
+void Room::activateEncryption()
+{
+    if(usesEncryption()) {
+        qCWarning(E2EE) << "Room" << objectName() << "is already encrypted";
+        return;
+    }
+    setState<EncryptionEvent>(EncryptionEventContent::MegolmV1AesSha2);
+}
diff --git a/lib/room.h b/lib/room.h
index 7290f9a9..c4d94c02 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -607,6 +607,12 @@ public Q_SLOTS:
     void answerCall(const QString& callId, const QString& sdp);
     void hangupCall(const QString& callId);
 
+    /**
+     * Activates encryption for this room.
+     * Warning: Cannot be undone
+     */
+    void activateEncryption();
+
 Q_SIGNALS:
     /// Initial set of state events has been loaded
     /**