Split up ATM parts of trust storage and refactor (#388)

QXmppTrustStorage is now the base class for all trust storages used by
end-to-end encryption managers.
QXmppAtmTrustStorage is used by QXmppAtmManager.

QXmppTrustMemoryStorage is now the base class for all trust storages
that use the memory for storing data.
QXmppAtmTrustMemoryStorage can be used by QXmppAtmManager.

Methods needed by the upcoming OMEMO implementation are added.
Some existing methods are refactored.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/client/QXmppAtmManager.h b/src/client/QXmppAtmManager.h
index 5c2dc1e7..042d1342 100644
--- a/src/client/QXmppAtmManager.h
+++ b/src/client/QXmppAtmManager.h
@@ -5,18 +5,19 @@
 #ifndef QXMPPATMMANAGER_H
 #define QXMPPATMMANAGER_H
 
+#include "QXmppAtmTrustStorage.h"
 #include "QXmppClientExtension.h"
-#include "QXmppMessage.h"
 #include "QXmppSendResult.h"
-#include "QXmppTrustMessageKeyOwner.h"
-#include "QXmppTrustStorage.h"
+
+class QXmppMessage;
+class QXmppTrustMessageKeyOwner;
 
 class QXMPP_EXPORT QXmppAtmManager : public QXmppClientExtension
 {
     Q_OBJECT
 
 public:
-    QXmppAtmManager(QXmppTrustStorage *trustStorage);
+    QXmppAtmManager(QXmppAtmTrustStorage *trustStorage);
     QFuture<void> makeTrustDecisions(const QString &encryption, const QString &keyOwnerJid, const QList<QByteArray> &keyIdsForAuthentication, const QList<QByteArray> &keyIdsForDistrusting = {});
 
     /// \cond
@@ -41,7 +42,7 @@ private:
 
     QFuture<QXmpp::SendResult> sendTrustMessage(const QString &encryption, const QList<QXmppTrustMessageKeyOwner> &keyOwners, const QString &recipientJid);
 
-    QXmppTrustStorage *m_trustStorage;
+    QXmppAtmTrustStorage *m_trustStorage;
 
     friend class tst_QXmppAtmManager;
 };