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/desktop-client into feature/container-existence-on-container-setup

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-02-27 19:42:47 +03:00
commit f2e9631af4
24 changed files with 468 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/ui/pages_logic/StartPageLogic.cpp
View file

@ -13,6 +13,7 @@
#ifdef Q_OS_ANDROID
#include <QJniObject>
#include "../../platforms/android/androidutils.h"
#include "../../platforms/android/android_controller.h"
#endif
namespace {
@ -184,6 +185,13 @@ void StartPageLogic::onPushButtonImportOpenFile()
}
}
#ifdef Q_OS_ANDROID
void StartPageLogic::startQrDecoder()
{
AndroidController::instance()->startQrReaderActivity();
}
#endif
bool StartPageLogic::importConnection(const QJsonObject &profile)
{
ServerCredentials credentials;