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

Merge remote-tracking branch 'remotes/origin/dev' into feature/new-gui

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-06-27 13:38:06 +03:00
commit d0c9c1043c
179 changed files with 3824 additions and 4107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/pages_logic/AppSettingsLogic.cpp
View file

@ -1,7 +1,7 @@
#include "AppSettingsLogic.h"
#include "logger.h"
#include "defines.h"
#include "version.h"
#include "ui/qautostart.h"
#include "ui/uilogic.h"

2
client/ui/pages_logic/ClientInfoLogic.cpp
View file

@ -2,7 +2,7 @@
#include <QMessageBox>
#include "defines.h"
#include "version.h"
#include "core/errorstrings.h"
#include "core/servercontroller.h"
#include "ui/models/clientManagementModel.h"

2
client/ui/pages_logic/ClientManagementLogic.cpp
View file

@ -2,7 +2,7 @@
#include <QMessageBox>
#include "defines.h"
#include "version.h"
#include "core/errorstrings.h"
#include "core/servercontroller.h"
#include "ui/pages_logic/ClientInfoLogic.h"

2
client/ui/pages_logic/NetworkSettingsLogic.cpp
View file

@ -1,6 +1,6 @@
#include "NetworkSettingsLogic.h"
#include "defines.h"
#include "version.h"
#include "utilities.h"
#include "settings.h"

2
client/ui/pages_logic/ServerConfiguringProgressLogic.cpp
View file

@ -1,5 +1,5 @@
#include "ServerConfiguringProgressLogic.h"
#include "defines.h"
#include "version.h"
#include "core/errorstrings.h"
#include <QTimer>
#include <QEventLoop>

5
client/ui/pages_logic/ServerSettingsLogic.cpp
View file

@ -100,6 +100,11 @@ void ServerSettingsLogic::onLineEditDescriptionEditingFinished()
uiLogic()->onUpdateAllPages();
}
bool ServerSettingsLogic::isCurrentServerHasCredentials()
{
return m_settings->haveAuthData(uiLogic()->m_selectedServerIndex);
}
#if defined(Q_OS_ANDROID)
/* Auth result handler for Android */
void authResultReceiver::handleActivityResult(int receiverRequestCode, int resultCode, const QJniObject &data)

2
client/ui/pages_logic/ServerSettingsLogic.h
View file

@ -31,6 +31,8 @@ public:
Q_INVOKABLE void onPushButtonClearClientCacheClicked();
Q_INVOKABLE void onLineEditDescriptionEditingFinished();
Q_INVOKABLE bool isCurrentServerHasCredentials();
public:
explicit ServerSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
~ServerSettingsLogic() = default;

2
client/ui/pages_logic/ShareConnectionLogic.cpp
View file

@ -14,7 +14,7 @@
#include "configurators/ikev2_configurator.h"
#include "configurators/ssh_configurator.h"
#include "defines.h"
#include "version.h"
#include "core/defs.h"
#include "core/errorstrings.h"
#include "core/servercontroller.h"

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

@ -192,7 +192,7 @@ void StartPageLogic::onPushButtonImportOpenFile()
file.open(QIODevice::ReadOnly);
QByteArray data = file.readAll();
selectConfigFormat(QString(data));
importAnyFile(QString(data));
}
#ifdef Q_OS_ANDROID
@ -202,7 +202,7 @@ void StartPageLogic::startQrDecoder()
}
#endif
void StartPageLogic::selectConfigFormat(QString configData)
void StartPageLogic::importAnyFile(const QString &configData)
{
auto configFormat = checkConfigFormat(configData);
if (configFormat == ConfigTypes::OpenVpn) {

4
client/ui/pages_logic/StartPageLogic.h
View file

@ -23,7 +23,7 @@ class StartPageLogic : public PageLogicBase
AUTO_PROPERTY(QString, labelWaitInfoText)
AUTO_PROPERTY(bool, pushButtonBackFromStartVisible)
AUTO_PROPERTY(QString, privateKeyPassphrase);
AUTO_PROPERTY(QString, privateKeyPassphrase)
READONLY_PROPERTY(QRegularExpression, ipAddressPortRegex)
public:
@ -37,7 +37,7 @@ public:
Q_INVOKABLE void startQrDecoder();
#endif
void selectConfigFormat(QString configData);
void importAnyFile(const QString &configData);
bool importConnection(const QJsonObject &profile);
bool importConnectionFromCode(QString code);

3
client/ui/pages_logic/VpnLogic.cpp
View file

@ -7,7 +7,7 @@
#include <QTimer>
#include <functional>
#include "../uilogic.h"
#include "defines.h"
#include "version.h"
#include <configurators/vpn_configurator.h>
@ -80,7 +80,6 @@ void VpnLogic::onUpdatePage()
set_labelCurrentDns(dns.first + ", " + dns.second);
}
set_isContainerSupportedByCurrentPlatform(ContainerProps::isSupportedByCurrentPlatform(selectedContainer));
if (!isContainerSupportedByCurrentPlatform()) {
set_labelErrorText(tr("AmneziaVPN not supporting selected protocol on this device. Select another protocol."));