From 363a7e40e8aa12cb780b076cca8db4f47b70f4fa Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Mon, 26 Sep 2022 09:44:20 +0200
Subject: Replace QOlmError with OlmErrorCode

QOlmError represents a subset of OlmErrorCode, and the associated
fromString() function uses undocumented strings produced inside Olm;
meanwhile OlmErrorCode is documented in its own header file. Each QOlm*
class now has lastErrorCode() next to lastError() (that, from now,
returns a textual representation straight from Olm, not QOlmError enum).

Also: including olm/error.h in e2ee/e2ee.h required some rearrangement
of the code to make sure non-E2EE configuration still builds.
---
 lib/e2ee/e2ee.h | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'lib/e2ee/e2ee.h')

diff --git a/lib/e2ee/e2ee.h b/lib/e2ee/e2ee.h
index 0772b70a..51ceff67 100644
--- a/lib/e2ee/e2ee.h
+++ b/lib/e2ee/e2ee.h
@@ -6,21 +6,20 @@
 #pragma once
 
 #include "converters.h"
-#include "expected.h"
-#include "qolmerrors.h"
 
 #include <QtCore/QMetaType>
 #include <QtCore/QStringBuilder>
 
 #include <array>
-#include <variant>
 
-namespace Quotient {
+#ifdef Quotient_E2EE_ENABLED
+#    include "expected.h"
+
+#    include <olm/error.h>
+#    include <variant>
+#endif
 
-constexpr auto CiphertextKeyL = "ciphertext"_ls;
-constexpr auto SenderKeyKeyL = "sender_key"_ls;
-constexpr auto DeviceIdKeyL = "device_id"_ls;
-constexpr auto SessionIdKeyL = "session_id"_ls;
+namespace Quotient {
 
 constexpr auto AlgorithmKeyL = "algorithm"_ls;
 constexpr auto RotationPeriodMsKeyL = "rotation_period_ms"_ls;
@@ -47,6 +46,7 @@ inline bool isSupportedAlgorithm(const QString& algorithm)
            != SupportedAlgorithms.cend();
 }
 
+#ifdef Quotient_E2EE_ENABLED
 struct Unencrypted {};
 struct Encrypted {
     QByteArray key;
@@ -64,7 +64,8 @@ class QOlmOutboundGroupSession;
 using QOlmOutboundGroupSessionPtr = std::unique_ptr<QOlmOutboundGroupSession>;
 
 template <typename T>
-using QOlmExpected = Expected<T, QOlmError>;
+using QOlmExpected = Expected<T, OlmErrorCode>;
+#endif
 
 struct IdentityKeys
 {
@@ -133,23 +134,6 @@ private:
 
 using OneTimeKeys = QHash<QString, std::variant<QString, SignedOneTimeKey>>;
 
-template <typename T>
-class asKeyValueRange
-{
-public:
-    asKeyValueRange(T& data)
-        : m_data { data }
-    {}
-
-    auto begin() { return m_data.keyValueBegin(); }
-    auto end() { return m_data.keyValueEnd(); }
-
-private:
-    T &m_data;
-};
-template <typename T>
-asKeyValueRange(T&) -> asKeyValueRange<T>;
-
 } // namespace Quotient
 
 Q_DECLARE_METATYPE(Quotient::SignedOneTimeKey)
-- 
cgit v1.2.3


From bcc05aa1d52cae2b6d8e70bb6cf04fa49904687a Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 21 Sep 2022 15:45:59 +0200
Subject: Cleanup across E2EE code

Notably:
- simplified unnecessarily verbose constructs;
- formally aligned (no re-numeration was necessary)
  QOlmMessage::Type with corresponding OLM_ constants;
- dropped QOlmSession::encryptMessageType() because it's very
  sensitive to the order of calling with QOlmSession::encrypt()
  (and encrypt() itself already calls it and returns the message
  type);
- simplify the return type of pickle() calls that can only fail due to
  an internal error;
- replace const QString& with QStringView or const QByteArray&
  where appropriate;
- use '\0' where it was meant to be instead of '0'.
---
 lib/e2ee/e2ee.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/e2ee/e2ee.h')

diff --git a/lib/e2ee/e2ee.h b/lib/e2ee/e2ee.h
index 51ceff67..5999c0be 100644
--- a/lib/e2ee/e2ee.h
+++ b/lib/e2ee/e2ee.h
@@ -98,7 +98,7 @@ public:
     {}
 
     //! Unpadded Base64-encoded 32-byte Curve25519 public key
-    QString key() const { return payload["key"_ls].toString(); }
+    QByteArray key() const { return payload["key"_ls].toString().toLatin1(); }
 
     //! \brief Signatures of the key object
     //!
-- 
cgit v1.2.3