diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-08-10 08:18:17 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-10-10 20:46:01 +0200 |
| commit | 01103222dc59526b37d594b93b0b1cd7473e3f6f (patch) | |
| tree | 8e3b679377571fd9b9014afbe62eeba6249d42e2 /lib/events/encryptionevent.cpp | |
| parent | 4f08c88d234119c2a76874ebd2b1433b81992427 (diff) | |
| parent | 7b516cdf0b987e542b1e4cd4556ecb2bfbde3ff9 (diff) | |
| download | libquotient-01103222dc59526b37d594b93b0b1cd7473e3f6f.tar.gz libquotient-01103222dc59526b37d594b93b0b1cd7473e3f6f.zip | |
Merge branch 'master' into kitsune-fix-read-receipts-and-markers
Diffstat (limited to 'lib/events/encryptionevent.cpp')
| -rw-r--r-- | lib/events/encryptionevent.cpp | 8 |
1 files changed, 8 insertions, 0 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); |