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

Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-28 14:44:47 +03:00
commit 36a2482165
32 changed files with 948 additions and 3192 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/amnezia_application.cpp
View file

@ -21,7 +21,8 @@
#include "protocols/qml_register_protocols.h"
#if defined(Q_OS_IOS)
#include "platforms/ios/QtAppDelegate-C-Interface.h"
#include "platforms/ios/QtAppDelegate-C-Interface.h"
#include "platforms/ios/ios_controller.h"
#endif
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@ -107,6 +108,7 @@ void AmneziaApplication::init()
&ImportController::extractConfigFromData);
connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_pageController.get(),
&PageController::goToPageViewConfig);
IosController::Instance()->initialize();
#endif
m_notificationHandler.reset(NotificationHandler::create(nullptr));