diff options
author | Tobias Fella <fella@posteo.de> | 2021-09-11 16:18:35 +0200 |
---|---|---|
committer | Tobias Fella <fella@posteo.de> | 2021-09-11 21:02:47 +0200 |
commit | 0209be8305aa38722a3d25593ae71fbb3ac05e52 (patch) | |
tree | ab80c8b140f483c408209922a0c72b06912bd3a1 /lib/events | |
parent | 9e548e0625a819052cd10d5c4bf129dde649a6a4 (diff) | |
download | libquotient-0209be8305aa38722a3d25593ae71fbb3ac05e52.tar.gz libquotient-0209be8305aa38722a3d25593ae71fbb3ac05e52.zip |
Add convenience function for activating encryption and fix
EncryptionEvent constructor
Diffstat (limited to 'lib/events')
-rw-r--r-- | lib/events/encryptionevent.cpp | 8 | ||||
-rw-r--r-- | lib/events/encryptionevent.h | 4 |
2 files changed, 9 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; |