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

Merge branch 'dev' into ios-wireguard

Browse Source
This commit is contained in:
pokamest
2021-11-30 21:51:06 +03:00
parent 38336fdb02 d28a2ebc57
commit bf8b3c3b2f
45 changed files with 1063 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnconnection.cpp
+5 -7
View File
@@ -12,7 +12,8 @@
#include <protocols/wireguardprotocol.h>
#ifdef Q_OS_ANDROID
#include <protocols/android_vpnprotocol.h>
#include "android_controller.h"
#include "protocols/android_vpnprotocol.h"
#endif
#ifdef Q_OS_IOS
@@ -261,11 +262,8 @@ void VpnConnection::connectToVpn(int serverIndex,
#elif defined Q_OS_ANDROID
Proto proto = ContainerProps::defaultProtocol(container);
AndroidVpnProtocol *androidVpnProtocol = new AndroidVpnProtocol(proto, m_vpnConfiguration);
if (!androidVpnProtocol->initialize()) {
qDebug() << QString("Init failed") ;
emit VpnProtocol::Error;
return;
}
connect(AndroidController::instance(), &AndroidController::connectionStateChanged, androidVpnProtocol, &AndroidVpnProtocol::setConnectionState);
m_vpnProtocol.reset(androidVpnProtocol);
#elif defined Q_OS_IOS
Proto proto = ContainerProps::defaultProtocol(container);
@@ -279,7 +277,7 @@ void VpnConnection::connectToVpn(int serverIndex,
#endif
connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::ConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::ConnectionState)));
connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::VpnConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::VpnConnectionState)));
connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64)));
ServerController::disconnectFromHost(credentials);