andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-21 02:01:03 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

added ConnectionController error handling

Browse Source
This commit is contained in:
vladimir.kuznetsov
2023-06-05 22:40:35 +08:00
parent 420c33d3ba
commit 80fca589af
11 changed files with 134 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/connectionController.cpp
+31 -14
View File
@@ -2,11 +2,31 @@
#include <QApplication>
#include "core/errorstrings.h"
ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel,
const QSharedPointer<ContainersModel> &containersModel,
QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel)
const QSharedPointer<VpnConnection> &vpnConnection,
QObject *parent)
: QObject(parent)
, m_serversModel(serversModel)
, m_containersModel(containersModel)
, m_vpnConnection(vpnConnection)
{
connect(m_vpnConnection.get(),
&VpnConnection::connectionStateChanged,
this,
&ConnectionController::connectionStateChanged);
connect(this,
&ConnectionController::connectToVpn,
m_vpnConnection.get(),
&VpnConnection::connectToVpn,
Qt::QueuedConnection);
connect(this,
&ConnectionController::disconnectFromVpn,
m_vpnConnection.get(),
&VpnConnection::disconnectFromVpn,
Qt::QueuedConnection);
}
void ConnectionController::openConnection()
@@ -21,19 +41,11 @@ void ConnectionController::openConnection()
const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
ContainersModel::Roles::ConfigRole));
// if (m_settings->containers(serverIndex).isEmpty()) {
// set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
// set_pushButtonConnectChecked(false);
// return;
// }
if (container == DockerContainer::None) {
emit connectionErrorOccurred(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
return;
}
// if (container == DockerContainer::None) {
// set_labelErrorText(tr("VPN Protocol not chosen"));
// set_pushButtonConnectChecked(false);
// return;
// }
//todo error handling
qApp->processEvents();
emit connectToVpn(serverIndex, credentials, container, containerConfig);
}
@@ -43,6 +55,11 @@ void ConnectionController::closeConnection()
emit disconnectFromVpn();
}
QString ConnectionController::getLastConnectionError()
{
return errorString(m_vpnConnection->lastError());
}
bool ConnectionController::isConnected()
{
return m_isConnected;