Transfer JidDb to TrustDb

This commit is contained in:
Xavier Del Campo Romero 2023-08-28 00:20:30 +02:00
parent e3c11fd054
commit d32b9e9357
Signed by: xavi
GPG Key ID: 84FF3612A9BF43F2
4 changed files with 8 additions and 5 deletions

View File

@ -4,7 +4,7 @@ Client::Client(const QString &jid, QObject *const parent) :
QXmppClient(parent),
jid(jid),
db(jid),
trust_db(jid),
trust_db(jid, db),
trust(&trust_db),
omemo_db(jid),
omemo(&omemo_db)

View File

@ -32,7 +32,7 @@ public:
JidDb(const QString &jid);
QStringList roster() const;
const QString jid;
const QString &jid;
public Q_SLOTS:
QList<Conversation> conversations() const;

View File

@ -7,8 +7,9 @@
#include <QtConcurrent>
#include <iostream>
TrustDb::TrustDb(const QString &jid) :
jid(jid)
TrustDb::TrustDb(const QString &jid, const JidDb &db) :
jid(jid),
db(db)
{
}

View File

@ -1,6 +1,7 @@
#ifndef TRUST_DB_H
#define TRUST_DB_H
#include "jiddb.h"
#include <QXmppClient.h>
#include <QXmppTask.h>
#include <QXmppTrustLevel.h>
@ -14,7 +15,7 @@
class TrustDb : virtual public QXmppTrustStorage
{
public:
TrustDb(const QString &jid);
TrustDb(const QString &jid, const JidDb &db);
QXmppTask<void> setSecurityPolicy(const QString &encryption,
QXmpp::TrustSecurityPolicy securityPolicy) override;
@ -64,6 +65,7 @@ public:
private:
const QString &jid;
const JidDb &db;
QString service() const;
};