From 9f71b2a79fba7c5d5ce09ebfdd482c8c470203d9 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Thu, 28 Jan 2021 21:59:20 +0100
Subject: Remove duplicated file

---
 lib/e2ee.h                     | 35 -----------------------------------
 lib/encryptionmanager.cpp      |  2 +-
 lib/events/encryptedevent.h    |  2 +-
 lib/events/encryptionevent.cpp |  2 +-
 lib/room.cpp                   |  2 +-
 5 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 lib/e2ee.h

diff --git a/lib/e2ee.h b/lib/e2ee.h
deleted file mode 100644
index 4044aa02..00000000
--- a/lib/e2ee.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
-// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#pragma once
-
-#include "util.h"
-
-#include <QtCore/QStringList>
-
-namespace Quotient {
-inline const auto CiphertextKeyL = "ciphertext"_ls;
-inline const auto SenderKeyKeyL = "sender_key"_ls;
-inline const auto DeviceIdKeyL = "device_id"_ls;
-inline const auto SessionIdKeyL = "session_id"_ls;
-
-inline const auto AlgorithmKeyL = "algorithm"_ls;
-inline const auto RotationPeriodMsKeyL = "rotation_period_ms"_ls;
-inline const auto RotationPeriodMsgsKeyL = "rotation_period_msgs"_ls;
-
-inline const auto AlgorithmKey = QStringLiteral("algorithm");
-inline const auto RotationPeriodMsKey = QStringLiteral("rotation_period_ms");
-inline const auto RotationPeriodMsgsKey =
-    QStringLiteral("rotation_period_msgs");
-
-inline const auto Ed25519Key = QStringLiteral("ed25519");
-inline const auto Curve25519Key = QStringLiteral("curve25519");
-inline const auto SignedCurve25519Key = QStringLiteral("signed_curve25519");
-inline const auto OlmV1Curve25519AesSha2AlgoKey =
-    QStringLiteral("m.olm.v1.curve25519-aes-sha2");
-inline const auto MegolmV1AesSha2AlgoKey =
-    QStringLiteral("m.megolm.v1.aes-sha2");
-inline const QStringList SupportedAlgorithms = { OlmV1Curve25519AesSha2AlgoKey,
-                                                 MegolmV1AesSha2AlgoKey };
-} // namespace Quotient
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index 37f3b7c3..569d369a 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -6,7 +6,7 @@
 #include "encryptionmanager.h"
 
 #include "connection.h"
-#include "e2ee.h"
+#include "crypto/e2ee.h"
 
 #include "csapi/keys.h"
 
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index de89a7c6..1d7ea913 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "e2ee.h"
+#include "crypto/e2ee.h"
 #include "roomevent.h"
 
 namespace Quotient {
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index aa05a96e..d7bb953a 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -4,7 +4,7 @@
 
 #include "encryptionevent.h"
 
-#include "e2ee.h"
+#include "crypto/e2ee.h"
 
 #include <array>
 
diff --git a/lib/room.cpp b/lib/room.cpp
index 6e6d7f11..0c9af2b9 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -12,7 +12,7 @@
 #include "avatar.h"
 #include "connection.h"
 #include "converters.h"
-#include "e2ee.h"
+#include "crypto/e2ee.h"
 #include "syncdata.h"
 #include "user.h"
 #include "eventstats.h"
-- 
cgit v1.2.3