WIP OMEMO TrustDb/JidDb

1 files changed, 10 insertions, 22 deletions

diff --git a/omemo_db.h b/omemo_db.h
index d331d8f..da3fd93 100644
--- a/omemo_db.h
+++ b/omemo_db.h
@@ -1,17 +1,24 @@
 #ifndef OMEMO_DB_H
 #define OMEMO_DB_H
 
+#include "jiddb.h"
+#include <QXmppGlobal.h>
 #include <QXmppOmemoStorage.h>
+#include <QXmppPromise.h>
 #include <QXmppTask.h>
+#include <qt5keychain/keychain.h>
 #include <QDateTime>
 #include <QByteArray>
 #include <QString>
+#include <QSqlDatabase>
 #include <cstdint>
 
-class OmemoDb : public QXmppOmemoStorage
+class OmemoDb : public QObject, public QXmppOmemoStorage
 {
+    Q_OBJECT
+
 public:
-    OmemoDb(const QString &jid);
+    OmemoDb(const JidDb &db);
     QXmppTask<OmemoData> allData() override;
     QXmppTask<void> setOwnDevice(
             const std::optional<OwnDevice> &device) override;
@@ -29,26 +36,7 @@ public:
     QXmppTask<void> resetAll() override;
 
 private:
-    const QString &jid;
-    QString service() const;
-    static int storeOwnKeyId(const QString &service, uint32_t id);
-    static int storePrivateIdentityKey(const QString &service,
-        const QByteArray &privateIdentityKey);
-    static int storePublicIdentityKey(const QString &service,
-        const QByteArray &publicIdentityKey);
-    static int storeLatestSignedPreKeyId(const QString &service,
-        uint32_t latestSignedPreKeyId);
-    static int storeLatestPreKeyId(const QString &service,
-        uint32_t latestPreKeyId);
-    static int storeDeviceLabel(const QString &service, const QString &label);
-    static int storeKeyId(const QString &service, const QByteArray &keyId);
-    static int storeSession(const QString &service, const QByteArray &session);
-    static int storeUnrespondedSentStanzasCount(const QString &service,
-        int count);
-    static int storeUnrespondedReceivedStanzasCount(const QString &service,
-        int count);
-    static int storeRemovalFromDeviceListDate(const QString &service,
-        const QDateTime &dt);
+    const JidDb &db;
 };
 
 #endif