From 29510632780f695eefc9d5107e223aa02caac2c6 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Sat, 26 Feb 2022 19:40:13 +0100
Subject: Use QOlmMessage::Type in more places

Make sure that the enum values correspond to the values used in the spec
and use them instead of magic constants
---
 lib/connection.cpp     | 4 ++--
 lib/e2ee/qolmmessage.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 66df1e43..b06c35c2 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -274,10 +274,10 @@ public:
         QString decrypted;
         int type = personalCipherObject.value(TypeKeyL).toInt(-1);
         QByteArray body = personalCipherObject.value(BodyKeyL).toString().toLatin1();
-        if (type == 0) {
+        if (type == QOlmMessage::PreKey) {
             QOlmMessage preKeyMessage(body, QOlmMessage::PreKey);
             decrypted = sessionDecryptPrekey(preKeyMessage, senderKey, account);
-        } else if (type == 1) {
+        } else if (type == QOlmMessage::General) {
             QOlmMessage message(body, QOlmMessage::General);
             decrypted = sessionDecryptGeneral(message, senderKey);
         }
diff --git a/lib/e2ee/qolmmessage.h b/lib/e2ee/qolmmessage.h
index 5d5db636..b4285a93 100644
--- a/lib/e2ee/qolmmessage.h
+++ b/lib/e2ee/qolmmessage.h
@@ -22,8 +22,8 @@ class QUOTIENT_API QOlmMessage : public QByteArray {
     Q_GADGET
 public:
     enum Type {
+        PreKey = 0,
         General,
-        PreKey,
     };
     Q_ENUM(Type)
 
-- 
cgit v1.2.3