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

feat: add platform-specific close window behavior for macOS App Store build with Network Extension

Browse source 
Closes: QA-12
This commit is contained in:
Yaroslav Yashin 2025-05-13 23:30:28 +03:00
parent dd0e2a6cb8
commit 32c3b758af
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/ui/controllers/pageController.cpp
View file

@ -1,6 +1,9 @@
#include "pageController.h" #include "pageController.h"
#include "utils/converter.h" #include "utils/converter.h"
#include "core/errorstrings.h" #include "core/errorstrings.h"
#if defined(MACOS_NE)
#include "platforms/ios/ios_controller.h"
#endif
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(MACOS_NE) #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(MACOS_NE)
#include <QGuiApplication> #include <QGuiApplication>
@ -58,6 +61,21 @@ void PageController::closeWindow()
{ {
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
qApp->quit(); qApp->quit();
#elif defined(MACOS_NE)
// macOS App Store build with Network Extension: hide UI, then gracefully disconnect NE and quit
emit hideMainWindow();
{
auto ctrl = IosController::Instance();
// when NE state changes to Disconnected, quit app
connect(ctrl, &IosController::connectionStateChanged, this, [=](Vpn::ConnectionState s) {
if (s == Vpn::ConnectionState::Disconnected) {
qApp->quit();
}
});
ctrl->disconnectVpn();
}
#else #else
if (m_serversModel->getServersCount() == 0) { if (m_serversModel->getServersCount() == 0) {
qApp->quit(); qApp->quit();