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

Fixes for iOS

Browse source
This commit is contained in:
pokamest 2023-08-28 14:14:10 -07:00
parent 8f6aa950cd
commit 810da0db61
4 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/platforms/ios/ios_controller.h
View file

@ -47,7 +47,7 @@ public:
void getBackendLogs(std::function<void (const QString &)> &&callback); void getBackendLogs(std::function<void (const QString &)> &&callback);
void checkStatus(); void checkStatus();
signals: signals:
void connectionStateChanged(VpnProtocol::VpnConnectionState state); void connectionStateChanged(Vpn::ConnectionState state);
void bytesChanged(quint64 receivedBytes, quint64 sentBytes); void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
protected slots: protected slots:

28
client/platforms/ios/ios_controller.mm
View file

@ -30,22 +30,22 @@ const char* MessageKey::host = "host";
const char* MessageKey::port = "port"; const char* MessageKey::port = "port";
const char* MessageKey::isOnDemand = "is-on-demand"; const char* MessageKey::isOnDemand = "is-on-demand";
VpnProtocol::VpnConnectionState iosStatusToState(NEVPNStatus status) { Vpn::ConnectionState iosStatusToState(NEVPNStatus status) {
switch (status) { switch (status) {
case NEVPNStatusInvalid: case NEVPNStatusInvalid:
return VpnProtocol::VpnConnectionState::Unknown; return Vpn::ConnectionState::Unknown;
case NEVPNStatusDisconnected: case NEVPNStatusDisconnected:
return VpnProtocol::VpnConnectionState::Disconnected; return Vpn::ConnectionState::Disconnected;
case NEVPNStatusConnecting: case NEVPNStatusConnecting:
return VpnProtocol::VpnConnectionState::Connecting; return Vpn::ConnectionState::Connecting;
case NEVPNStatusConnected: case NEVPNStatusConnected:
return VpnProtocol::VpnConnectionState::Connected; return Vpn::ConnectionState::Connected;
case NEVPNStatusReasserting: case NEVPNStatusReasserting:
return VpnProtocol::VpnConnectionState::Connecting; return Vpn::ConnectionState::Connecting;
case NEVPNStatusDisconnecting: case NEVPNStatusDisconnecting:
return VpnProtocol::VpnConnectionState::Disconnecting; return Vpn::ConnectionState::Disconnecting;
default: default:
return VpnProtocol::VpnConnectionState::Unknown; return Vpn::ConnectionState::Unknown;
} }
} }
@ -85,7 +85,7 @@ bool IosController::initialize()
@try { @try {
if (error) { if (error) {
qDebug() << "IosController::initialize : Error:" << [error.localizedDescription UTF8String]; qDebug() << "IosController::initialize : Error:" << [error.localizedDescription UTF8String];
emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error); emit connectionStateChanged(Vpn::ConnectionState::Error);
ok = false; ok = false;
return; return;
} }
@ -147,7 +147,7 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
@try { @try {
if (error) { if (error) {
qDebug() << "IosController::connectVpn : Error:" << [error.localizedDescription UTF8String]; qDebug() << "IosController::connectVpn : Error:" << [error.localizedDescription UTF8String];
emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error); emit connectionStateChanged(Vpn::ConnectionState::Error);
ok = false; ok = false;
return; return;
} }
@ -161,7 +161,7 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
m_currentTunnel = manager; m_currentTunnel = manager;
qDebug() << "IosController::connectVpn : Using existing tunnel"; qDebug() << "IosController::connectVpn : Using existing tunnel";
if (manager.connection.status == NEVPNStatusConnected) { if (manager.connection.status == NEVPNStatusConnected) {
emit connectionStateChanged(VpnProtocol::VpnConnectionState::Connected); emit connectionStateChanged(Vpn::ConnectionState::Connected);
return; return;
} }
@ -356,7 +356,7 @@ void IosController::startTunnel()
if (saveError) { if (saveError) {
qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Save Error" << saveError.localizedDescription.UTF8String; qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Save Error" << saveError.localizedDescription.UTF8String;
emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error); emit connectionStateChanged(Vpn::ConnectionState::Error);
return; return;
} }
@ -365,7 +365,7 @@ void IosController::startTunnel()
if (loadError) { if (loadError) {
qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Load Error" << loadError.localizedDescription.UTF8String; qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Load Error" << loadError.localizedDescription.UTF8String;
emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error); emit connectionStateChanged(Vpn::ConnectionState::Error);
return; return;
} }
@ -389,7 +389,7 @@ void IosController::startTunnel()
if (!started || startError) { if (!started || startError) {
qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Start Error" qDebug() << "IosController::startOpenVPN : Connect OpenVPN Tunnel Start Error"
<< (startError ? startError.localizedDescription.UTF8String : ""); << (startError ? startError.localizedDescription.UTF8String : "");
emit connectionStateChanged(VpnProtocol::VpnConnectionState::Error); emit connectionStateChanged(Vpn::ConnectionState::Error);
} else { } else {
qDebug() << "IosController::startOpenVPN : Starting the tunnel succeeded"; qDebug() << "IosController::startOpenVPN : Starting the tunnel succeeded";
} }

4
client/ui/controllers/settingsController.cpp
View file

@ -2,6 +2,10 @@
#include <QStandardPaths> #include <QStandardPaths>
#ifdef Q_OS_IOS
#include <CoreFoundation/CoreFoundation.h>
#endif
#include "fileUtilites.h" #include "fileUtilites.h"
#include "logger.h" #include "logger.h"
#include "ui/qautostart.h" #include "ui/qautostart.h"

4
client/ui/controllers/sitesController.cpp
View file

@ -3,6 +3,10 @@
#include <QHostInfo> #include <QHostInfo>
#include <QStandardPaths> #include <QStandardPaths>
#ifdef Q_OS_IOS
#include <CoreFoundation/CoreFoundation.h>
#endif
#include "fileUtilites.h" #include "fileUtilites.h"
#include "utilities.h" #include "utilities.h"