Merge branch 'master' into use-clang-format

1 files changed, 34 insertions, 0 deletions

diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h
new file mode 100644
index 00000000..a41d88e1
--- /dev/null
+++ b/lib/encryptionmanager.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <QtCore/QObject>
+
+#include <functional>
+#include <memory>
+
+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 = 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;
+    std::unique_ptr<Private> d;
+};
+
+} // namespace QMatrixClient