From e437c29654e8f988ad694083401bbef23fbbcb18 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Mon, 16 May 2022 20:51:41 +0200
Subject: More work; Update olm pickle & timestamps in database; Remove TODOs

---
 lib/events/encryptedfile.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/events')

diff --git a/lib/events/encryptedfile.cpp b/lib/events/encryptedfile.cpp
index e90be428..bb4e26c7 100644
--- a/lib/events/encryptedfile.cpp
+++ b/lib/events/encryptedfile.cpp
@@ -56,6 +56,7 @@ QByteArray EncryptedFile::decryptFile(const QByteArray& ciphertext) const
 
 std::pair<EncryptedFile, QByteArray> EncryptedFile::encryptFile(const QByteArray &plainText)
 {
+#ifdef Quotient_E2EE_ENABLED
     QByteArray k = getRandom(32);
     auto kBase64 = k.toBase64();
     QByteArray iv = getRandom(16);
@@ -73,6 +74,9 @@ std::pair<EncryptedFile, QByteArray> EncryptedFile::encryptFile(const QByteArray
     auto ivBase64 = iv.toBase64();
     EncryptedFile file = {{}, key, ivBase64.left(ivBase64.indexOf('=')), {{QStringLiteral("sha256"), hash.left(hash.indexOf('='))}}, "v2"_ls};
     return {file, cipherText};
+#else
+    return {{}, {}};
+#endif
 }
 
 void JsonObjectConverter<EncryptedFile>::dumpTo(QJsonObject& jo,
-- 
cgit v1.2.3