Move files

21 files changed, 45 insertions, 44 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a04da04d..40767573 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,14 +178,14 @@ list(APPEND lib_SRCS
     lib/jobs/syncjob.cpp
     lib/jobs/mediathumbnailjob.cpp
     lib/jobs/downloadfilejob.cpp
-    lib/olm/qolmaccount.cpp
-    lib/olm/qolmsession.cpp
-    lib/olm/qolminboundsession.cpp
-    lib/olm/qolmoutboundsession.cpp
-    lib/olm/utils.cpp
-    lib/olm/errors.cpp
-    lib/olm/session.cpp
-    lib/olm/message.cpp
+    lib/crypto/qolmaccount.cpp
+    lib/crypto/qolmsession.cpp
+    lib/crypto/qolminboundsession.cpp
+    lib/crypto/qolmoutboundsession.cpp
+    lib/crypto/utils.cpp
+    lib/crypto/errors.cpp
+    lib/crypto/session.cpp
+    lib/crypto/message.cpp
 )
 
 # Configure API files generation
diff --git a/autotests/testgroupsession.cpp b/autotests/testgroupsession.cpp
index 23c5bf8f..325ca2ec 100644
--- a/autotests/testgroupsession.cpp
+++ b/autotests/testgroupsession.cpp
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "testgroupsession.h"
-#include "olm/qolminboundsession.h"
-#include "olm/qolmoutboundsession.h"
-#include "olm/utils.h"
+#include <crypto/qolminboundsession.h>
+#include <crypto/qolmoutboundsession.h>
+#include <crypto/utils.h>
 
 using namespace Quotient;
 
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 2fac53bd..cbce845a 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "testolmaccount.h"
-#include "olm/qolmaccount.h"
-#include "csapi/definitions/device_keys.h"
-#include "events/encryptedfile.h"
+#include <crypto/qolmaccount.h>
+#include <csapi/definitions/device_keys.h>
+#include <events/encryptedfile.h>
 
 using namespace Quotient;
 
diff --git a/autotests/testolmsession.cpp b/autotests/testolmsession.cpp
index da0e36e3..462c8213 100644
--- a/autotests/testolmsession.cpp
+++ b/autotests/testolmsession.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "olm/session.h"
+#include <crypto/session.h>
 #include "testolmsession.h"
 
 using namespace Quotient;
diff --git a/lib/olm/e2ee.h b/lib/crypto/e2ee.h
index 74f876e4..74f876e4 100644
--- a/lib/olm/e2ee.h
+++ b/lib/crypto/e2ee.h
diff --git a/lib/olm/errors.cpp b/lib/crypto/errors.cpp
index a687e807..00ff962d 100644
--- a/lib/olm/errors.cpp
+++ b/lib/crypto/errors.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 #ifdef Quotient_E2EE_ENABLED
-#include "olm/errors.h"
+#include "crypto/errors.h"
 
 Quotient::OlmError Quotient::fromString(const std::string &error_raw) {
     if (error_raw.compare("BAD_ACCOUNT_KEY")) {
diff --git a/lib/olm/errors.h b/lib/crypto/errors.h
index 09d2a989..09d2a989 100644
--- a/lib/olm/errors.h
+++ b/lib/crypto/errors.h
diff --git a/lib/olm/message.cpp b/lib/crypto/message.cpp
index ac7038ae..830633bf 100644
--- a/lib/olm/message.cpp
+++ b/lib/crypto/message.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef Quotient_E2EE_ENABLED
-#include "olm/message.h"
+#include "crypto/message.h"
 
 using namespace Quotient;
 
diff --git a/lib/olm/message.h b/lib/crypto/message.h
index d2fe871e..1ae19ba8 100644
--- a/lib/olm/message.h
+++ b/lib/crypto/message.h
@@ -6,8 +6,8 @@
 
 #ifdef Quotient_E2EE_ENABLED
 
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
+#include <QObject>
+#include <QByteArray>
 
 namespace Quotient {
 
diff --git a/lib/olm/qolmaccount.cpp b/lib/crypto/qolmaccount.cpp
index ef51a395..8824e7ef 100644
--- a/lib/olm/qolmaccount.cpp
+++ b/lib/crypto/qolmaccount.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef Quotient_E2EE_ENABLED
-#include "qolmaccount.h"
-#include "olm/utils.h"
+#include "crypto/qolmaccount.h"
+#include "crypto/utils.h"
 #include <QJsonObject>
 #include <QJsonDocument>
 #include <QDebug>
diff --git a/lib/olm/qolmaccount.h b/lib/crypto/qolmaccount.h
index df5e1be2..f98d78ba 100644
--- a/lib/olm/qolmaccount.h
+++ b/lib/crypto/qolmaccount.h
@@ -4,10 +4,10 @@
 #pragma once
 #ifdef Quotient_E2EE_ENABLED
 
-#include "olm/e2ee.h"
-#include "olm/errors.h"
-#include "olm/olm.h"
-#include "olm/session.h"
+#include "crypto/e2ee.h"
+#include "crypto/errors.h"
+#include "crypto/session.h"
+#include <olm/olm.h>
 #include <QObject>
 
 struct OlmAccount;
diff --git a/lib/olm/qolminboundsession.cpp b/lib/crypto/qolminboundsession.cpp
index 11558f51..539fdc51 100644
--- a/lib/olm/qolminboundsession.cpp
+++ b/lib/crypto/qolminboundsession.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef Quotient_E2EE_ENABLED
-#include "olm/qolminboundsession.h"
+#include "crypto/qolminboundsession.h"
 #include <iostream>
 #include <cstring>
 using namespace Quotient;
diff --git a/lib/olm/qolminboundsession.h b/lib/crypto/qolminboundsession.h
index 739a8411..a58fbbbc 100644
--- a/lib/olm/qolminboundsession.h
+++ b/lib/crypto/qolminboundsession.h
@@ -10,8 +10,8 @@
 #include <variant>
 #include <memory>
 #include "olm/olm.h"
-#include "olm/errors.h"
-#include "olm/e2ee.h"
+#include "crypto/errors.h"
+#include "crypto/e2ee.h"
 
 namespace Quotient {
 
diff --git a/lib/olm/qolmoutboundsession.cpp b/lib/crypto/qolmoutboundsession.cpp
index e5c43495..3bfb0187 100644
--- a/lib/olm/qolmoutboundsession.cpp
+++ b/lib/crypto/qolmoutboundsession.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef Quotient_E2EE_ENABLED
-#include "olm/qolmoutboundsession.h"
-#include "olm/utils.h"
+#include "crypto/qolmoutboundsession.h"
+#include "crypto/utils.h"
 
 using namespace Quotient;
 
diff --git a/lib/olm/qolmoutboundsession.h b/lib/crypto/qolmoutboundsession.h
index 70c4d27f..6c6c635c 100644
--- a/lib/olm/qolmoutboundsession.h
+++ b/lib/crypto/qolmoutboundsession.h
@@ -5,8 +5,8 @@
 #ifdef Quotient_E2EE_ENABLED
 
 #include "olm/olm.h" // from Olm
-#include "olm/errors.h"
-#include "olm/e2ee.h"
+#include "crypto/errors.h"
+#include "crypto/e2ee.h"
 #include <memory>
 
 namespace Quotient {
diff --git a/lib/olm/qolmsession.cpp b/lib/crypto/qolmsession.cpp
index 32a108a8..afa42728 100644
--- a/lib/olm/qolmsession.cpp
+++ b/lib/crypto/qolmsession.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "olm/qolmsession.h"
+#include "crypto/qolmsession.h"
 
 using namespace Quotient;
 
diff --git a/lib/olm/qolmsession.h b/lib/crypto/qolmsession.h
index 08f47331..3be3c7fc 100644
--- a/lib/olm/qolmsession.h
+++ b/lib/crypto/qolmsession.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "olm/e2ee.h"
-#include "olm/olm.h"
-#include "olm/errors.h"
 #include <variant>
+#include <olm/olm.h>
+#include "crypto/e2ee.h"
+#include "crypto/errors.h"
 
 namespace Quotient {
 
diff --git a/lib/olm/session.cpp b/lib/crypto/session.cpp
index 94f12db6..8b2cb022 100644
--- a/lib/olm/session.cpp
+++ b/lib/crypto/session.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef Quotient_E2EE_ENABLED
-#include "olm/session.h"
-#include "olm/utils.h"
+#include "crypto/session.h"
+#include "crypto/utils.h"
 #include "logging.h"
 #include <cstring>
 
diff --git a/lib/olm/session.h b/lib/crypto/session.h
index 03b3514e..24702564 100644
--- a/lib/olm/session.h
+++ b/lib/crypto/session.h
@@ -6,11 +6,12 @@
 
 #ifdef Quotient_E2EE_ENABLED
 
-#include "olm/e2ee.h"
-#include "olm/message.h"
-#include "olm/errors.h"
 #include <QDebug>
-#include "olm/qolmaccount.h"
+#include <olm/olm.h>
+#include "crypto/e2ee.h"
+#include "crypto/message.h"
+#include "crypto/errors.h"
+#include "crypto/qolmaccount.h"
 
 namespace Quotient {
 
diff --git a/lib/olm/utils.cpp b/lib/crypto/utils.cpp
index 227e6d84..cb20abf8 100644
--- a/lib/olm/utils.cpp
+++ b/lib/crypto/utils.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef Quotient_E2EE_ENABLED
-#include "olm/utils.h"
+#include "crypto/utils.h"
 #include <QDebug>
 #include <openssl/rand.h>
 
diff --git a/lib/olm/utils.h b/lib/crypto/utils.h
index 85d4605b..cea87144 100644
--- a/lib/olm/utils.h
+++ b/lib/crypto/utils.h
@@ -5,7 +5,7 @@
 #pragma once
 #ifdef Quotient_E2EE_ENABLED
 
-#include "olm/e2ee.h"
+#include "crypto/e2ee.h"
 
 namespace Quotient {
 // Convert PicklingMode to key