Build fixes
This commit is contained in:
parent
1b80c59e65
commit
9c5e1faf46
3 changed files with 12 additions and 8 deletions
|
@ -1,7 +1,7 @@
|
||||||
# Amnezia VPN
|
# Amnezia VPN
|
||||||
## _The best client for self-hosted VPN_
|
## _The best client for self-hosted VPN_
|
||||||
|
|
||||||
[](https://travis-ci.com/amnezia-vpn/desktop-client)
|
[]
|
||||||
|
|
||||||
Amnezia is a VPN client with the key feature of deploying your own VPN server on you virtual server.
|
Amnezia is a VPN client with the key feature of deploying your own VPN server on you virtual server.
|
||||||
|
|
||||||
|
|
|
@ -105,13 +105,11 @@ void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState sta
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Q_OS_IOS
|
#ifdef Q_OS_IOS
|
||||||
|
if (state == VpnProtocol::Connected){
|
||||||
qDebug() << state;
|
|
||||||
if(state == VpnProtocol::Connected){
|
|
||||||
m_isIOSConnected = true;
|
m_isIOSConnected = true;
|
||||||
checkIOSStatus();
|
checkIOSStatus();
|
||||||
}else{
|
}
|
||||||
|
else {
|
||||||
m_isIOSConnected = false;
|
m_isIOSConnected = false;
|
||||||
m_receivedBytes = 0;
|
m_receivedBytes = 0;
|
||||||
m_sentBytes = 0;
|
m_sentBytes = 0;
|
||||||
|
@ -120,17 +118,17 @@ void VpnConnection::onConnectionStateChanged(VpnProtocol::VpnConnectionState sta
|
||||||
emit connectionStateChanged(state);
|
emit connectionStateChanged(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
void VpnConnection::checkIOSStatus()
|
void VpnConnection::checkIOSStatus()
|
||||||
{
|
{
|
||||||
QTimer::singleShot(1000, [this]() {
|
QTimer::singleShot(1000, [this]() {
|
||||||
|
|
||||||
if(m_isIOSConnected){
|
if(m_isIOSConnected){
|
||||||
iosVpnProtocol->checkStatus();
|
iosVpnProtocol->checkStatus();
|
||||||
checkIOSStatus();
|
checkIOSStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
const QString &VpnConnection::remoteAddress() const
|
const QString &VpnConnection::remoteAddress() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,7 +9,10 @@
|
||||||
#include "protocols/vpnprotocol.h"
|
#include "protocols/vpnprotocol.h"
|
||||||
#include "core/defs.h"
|
#include "core/defs.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
#include "protocols/ios_vpnprotocol.h"
|
#include "protocols/ios_vpnprotocol.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef AMNEZIA_DESKTOP
|
#ifdef AMNEZIA_DESKTOP
|
||||||
#include "core/ipcclient.h"
|
#include "core/ipcclient.h"
|
||||||
|
@ -74,7 +77,10 @@ signals:
|
||||||
protected slots:
|
protected slots:
|
||||||
void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
|
void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
|
||||||
void onConnectionStateChanged(VpnProtocol::VpnConnectionState state);
|
void onConnectionStateChanged(VpnProtocol::VpnConnectionState state);
|
||||||
|
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
void checkIOSStatus();
|
void checkIOSStatus();
|
||||||
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
QSharedPointer<VpnProtocol> m_vpnProtocol;
|
QSharedPointer<VpnProtocol> m_vpnProtocol;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue