forked from blue/squawk
replaced one structure, stored omemo support in Global object
This commit is contained in:
parent
dfe72ca36c
commit
758a9d95f3
5 changed files with 17 additions and 26 deletions
|
@ -22,7 +22,6 @@
|
|||
|
||||
Q_DECLARE_METATYPE(QXmppOmemoStorage::OwnDevice);
|
||||
Q_DECLARE_METATYPE(QXmppOmemoStorage::Device);
|
||||
Q_DECLARE_METATYPE(QXmppOmemoStorage::SignedPreKeyPair);
|
||||
|
||||
namespace Core {
|
||||
class Account;
|
||||
|
@ -30,6 +29,8 @@ class Account;
|
|||
class OmemoHandler : public QXmppOmemoStorage
|
||||
{
|
||||
public:
|
||||
typedef std::pair<QDateTime, QByteArray> SignedPreKeyPair;
|
||||
|
||||
OmemoHandler(Account* account);
|
||||
~OmemoHandler() override;
|
||||
|
||||
|
@ -37,7 +38,7 @@ public:
|
|||
|
||||
QFuture<void> setOwnDevice(const std::optional<OwnDevice> &device) override;
|
||||
|
||||
QFuture<void> addSignedPreKeyPair(uint32_t keyId, const SignedPreKeyPair &keyPair) override;
|
||||
QFuture<void> addSignedPreKeyPair(uint32_t keyId, const QXmppOmemoStorage::SignedPreKeyPair &keyPair) override;
|
||||
QFuture<void> removeSignedPreKeyPair(uint32_t keyId) override;
|
||||
|
||||
QFuture<void> addPreKeyPairs(const QHash<uint32_t, QByteArray> &keyPairs) override;
|
||||
|
@ -61,7 +62,7 @@ private:
|
|||
DataBase::Cache<QString, QVariant>* meta;
|
||||
DataBase::Cache<QString, QHash<uint32_t, Device>>* devices;
|
||||
DataBase::Cache<uint32_t, QByteArray>* preKeyPairs;
|
||||
DataBase::Cache<uint32_t, QXmppOmemoStorage::SignedPreKeyPair>* signedPreKeyPairs;
|
||||
DataBase::Cache<uint32_t, SignedPreKeyPair>* signedPreKeyPairs;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -72,7 +73,4 @@ QDataStream& operator >> (QDataStream &in, QXmppOmemoStorage::Device& device);
|
|||
QDataStream& operator << (QDataStream &out, const QXmppOmemoStorage::OwnDevice& device);
|
||||
QDataStream& operator >> (QDataStream &in, QXmppOmemoStorage::OwnDevice& device);
|
||||
|
||||
QDataStream& operator << (QDataStream &out, const QXmppOmemoStorage::SignedPreKeyPair& device);
|
||||
QDataStream& operator >> (QDataStream &in, QXmppOmemoStorage::SignedPreKeyPair& device);
|
||||
|
||||
#endif // CORE_OMEMOHANDLER_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue