AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved certificate content acquisition from ClientManagementLogic to ClientInfoLogic

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-01-17 21:04:15 +03:00
parent f6e8346841
commit d6d3bf6943
7 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/ui/models/clientManagementModel.cpp
View file

@ -1,8 +1,8 @@
#include "clientManagementModel.h"
ClientManagementModel::ClientManagementModel(std::shared_ptr<Settings> settings, QObject *parent) :
m_settings(settings),
QAbstractListModel(parent)
#include <QJsonObject>
ClientManagementModel::ClientManagementModel(QObject *parent) : QAbstractListModel(parent)
{
}
@ -21,13 +21,13 @@ void ClientManagementModel::setContent(const QVector<QVariant> &data)
endResetModel();
}
QJsonObject ClientManagementModel::getContent(Proto protocol)
QJsonObject ClientManagementModel::getContent(amnezia::Proto protocol)
{
QJsonObject clientsTable;
for (const auto &item : m_content) {
if (protocol == Proto::OpenVpn) {
if (protocol == amnezia::Proto::OpenVpn) {
clientsTable[item.toJsonObject()["openvpnCertId"].toString()] = item.toJsonObject();
} else if (protocol == Proto::WireGuard) {
} else if (protocol == amnezia::Proto::WireGuard) {
clientsTable[item.toJsonObject()["wireguardPublicKey"].toString()] = item.toJsonObject();
}
}

7
client/ui/models/clientManagementModel.h
View file

@ -3,7 +3,7 @@
#include <QAbstractListModel>
#include "settings.h"
#include "protocols/protocols_defs.h"
class ClientManagementModel : public QAbstractListModel
{
@ -17,11 +17,11 @@ public:
WireGuardPublicKey,
};
ClientManagementModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
ClientManagementModel(QObject *parent = nullptr);
void clearData();
void setContent(const QVector<QVariant> &data);
QJsonObject getContent(Proto protocol);
QJsonObject getContent(amnezia::Proto protocol);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
void setData(const QModelIndex &index, QVariant data, int role = Qt::DisplayRole);
@ -31,7 +31,6 @@ protected:
QHash<int, QByteArray> roleNames() const override;
private:
std::shared_ptr<Settings> m_settings; //TODO remove this?
QVector<QVariant> m_content;
};