From 69ba71cca36b4a90328d169c845195f39c041a3a Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <aa13q@ya.ru>
Date: Sat, 22 Jun 2019 19:57:18 +0300
Subject: Add EncryptionManager class. Add
 AccountSettings::encryptionAccountPickle logic.

---
 lib/encryptionmanager.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 lib/encryptionmanager.h

(limited to 'lib/encryptionmanager.h')

diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h
new file mode 100644
index 00000000..0bd05432
--- /dev/null
+++ b/lib/encryptionmanager.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <QtCore/QObject>
+
+namespace QMatrixClient
+{
+    class Connection;
+
+    class EncryptionManager: public QObject
+    {
+        Q_OBJECT
+
+        public:
+            // TODO: store constats separately?
+            // TODO: 0.5 oneTimeKeyThreshold instead of 0.1?
+            explicit EncryptionManager(const QByteArray& encryptionAccountPickle, float signedKeysProportion = 1, float oneTimeKeyThreshold = float(0.1),
+                                       QObject* parent = nullptr);
+            ~EncryptionManager();
+
+            void uploadIdentityKeys(Connection* connection);
+            void uploadOneTimeKeys(Connection* connection, bool forceUpdate = false);
+
+        private:
+            class Private;
+            std::unique_ptr<Private> d;
+
+    };
+
+}  // namespace QMatrixClient
-- 
cgit v1.2.3


From 0bfb1c1c69c02c7936cb018ead496616322a1cf7 Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <aa13q@ya.ru>
Date: Sun, 7 Jul 2019 21:53:22 +0300
Subject: E2EE: add new account generation logic

---
 lib/encryptionmanager.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/encryptionmanager.h')

diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h
index 0bd05432..40fe7383 100644
--- a/lib/encryptionmanager.h
+++ b/lib/encryptionmanager.h
@@ -15,12 +15,13 @@ namespace QMatrixClient
         public:
             // TODO: store constats separately?
             // TODO: 0.5 oneTimeKeyThreshold instead of 0.1?
-            explicit EncryptionManager(const QByteArray& encryptionAccountPickle, float signedKeysProportion = 1, float oneTimeKeyThreshold = float(0.1),
+            explicit EncryptionManager(const QByteArray& encryptionAccountPickle = QByteArray(), float signedKeysProportion = 1, float oneTimeKeyThreshold = float(0.1),
                                        QObject* parent = nullptr);
             ~EncryptionManager();
 
             void uploadIdentityKeys(Connection* connection);
             void uploadOneTimeKeys(Connection* connection, bool forceUpdate = false);
+            QByteArray olmAccountPickle();
 
         private:
             class Private;
-- 
cgit v1.2.3