blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull requests 3 Releases 10 Wiki Activity Actions

account refactoring, pep support discovery started

Browse source
This commit is contained in:
Blue 2022-04-08 19:18:15 +03:00
parent 82d54ba4df
commit 69e0c88d8d
Signed by: blue
GPG key ID: 9B203B252A63EE38
12 changed files with 588 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/account.h
View file

@ -39,7 +39,6 @@
#include <QXmppBookmarkManager.h>
#include <QXmppBookmarkSet.h>
#include <QXmppUploadRequestManager.h>
#include <QXmppVCardIq.h>
#include <QXmppVCardManager.h>
#include <QXmppMessageReceiptManager.h>
@ -50,6 +49,7 @@
#include "handlers/messagehandler.h"
#include "handlers/rosterhandler.h"
#include "handlers/vcardhandler.h"
namespace Core
{
@ -59,6 +59,7 @@ class Account : public QObject
Q_OBJECT
friend class MessageHandler;
friend class RosterHandler;
friend class VCardHandler;
public:
Account(
const QString& p_login,
@ -76,6 +77,8 @@ public:
QString getPassword() const;
QString getResource() const;
QString getAvatarPath() const;
QString getBareJid() const;
QString getFullJid() const;
Shared::Availability getAvailability() const;
Shared::AccountPassword getPasswordType() const;
@ -86,7 +89,6 @@ public:
void setResource(const QString& p_resource);
void setAvailability(Shared::Availability avail);
void setPasswordType(Shared::AccountPassword pt);
QString getFullJid() const;
void sendMessage(const Shared::Message& data);
void requestArchive(const QString& jid, int count, const QString& before);
void subscribeToContact(const QString& jid, const QString& reason);
@ -157,16 +159,13 @@ private:
bool reconnectScheduled;
QTimer* reconnectTimer;
std::set<QString> pendingVCardRequests;
QString avatarHash;
QString avatarType;
bool ownVCardRequestInProgress;
NetworkAccess* network;
Shared::AccountPassword passwordType;
bool pepSupport;
MessageHandler* mh;
RosterHandler* rh;
VCardHandler* vh;
private slots:
void onClientStateChange(QXmppClient::State state);
@ -179,9 +178,6 @@ private slots:
void onMamResultsReceived(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete);
void onMamLog(QXmppLogger::MessageType type, const QString &msg);
void onVCardReceived(const QXmppVCardIq& card);
void onOwnVCardReceived(const QXmppVCardIq& card);
void onDiscoveryItemsReceived (const QXmppDiscoveryIq& items);
void onDiscoveryInfoReceived (const QXmppDiscoveryIq& info);
@ -191,9 +187,6 @@ private:
void handleDisconnection();
void onReconnectTimer();
};
void initializeVCard(Shared::VCard& vCard, const QXmppVCardIq& card);
void initializeQXmppVCard(QXmppVCardIq& card, const Shared::VCard& vCard);
}