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

chore: fixed android build

Browse source
This commit is contained in:
vladimir.kuznetsov 2025-02-15 15:29:53 +07:00
parent a1ca994c8b
commit c128ba981c
11 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/core/controllers/coreController.cpp
View file

@ -1,5 +1,7 @@
#include "coreController.h"
#include <QTranslator>
#if defined(Q_OS_ANDROID)
#include "core/installedAppsImageProvider.h"
#include "platforms/android/android_controller.h"

2
client/core/controllers/coreController.h
View file

@ -26,7 +26,7 @@
#endif
#include "ui/models/api/apiAccountInfoModel.h"
#include "ui/models/api/apiServicesModel.h"
#include "ui/models/apiCountryModel.h"
#include "ui/models/api/apiCountryModel.h"
#include "ui/models/appSplitTunnelingModel.h"
#include "ui/models/clientManagementModel.h"
#include "ui/models/protocols/awgConfigModel.h"

3
client/core/controllers/gatewayController.cpp
View file

@ -1,5 +1,8 @@
#include "gatewayController.h"
#include <algorithm>
#include <random>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>

8
client/core/qrCodeUtils.cpp
View file

@ -3,7 +3,7 @@
#include <QIODevice>
#include <QList>
QList<QString> qrCodeUtuls::generateQrCodeImageSeries(const QByteArray &data)
QList<QString> qrCodeUtils::generateQrCodeImageSeries(const QByteArray &data)
{
double k = 850;
@ -12,7 +12,7 @@ QList<QString> qrCodeUtuls::generateQrCodeImageSeries(const QByteArray &data)
for (int i = 0; i < data.size(); i = i + k) {
QByteArray chunk;
QDataStream s(&chunk, QIODevice::WriteOnly);
s << qrCodeUtuls::qrMagicCode << chunksCount << (quint8)std::round(i / k) << data.mid(i, k);
s << qrCodeUtils::qrMagicCode << chunksCount << (quint8)std::round(i / k) << data.mid(i, k);
QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
@ -24,12 +24,12 @@ QList<QString> qrCodeUtuls::generateQrCodeImageSeries(const QByteArray &data)
return chunks;
}
QString qrCodeUtuls::svgToBase64(const QString &image)
QString qrCodeUtils::svgToBase64(const QString &image)
{
return "data:image/svg;base64," + QString::fromLatin1(image.toUtf8().toBase64().data());
}
qrcodegen::QrCode qrCodeUtuls::generateQrCode(const QByteArray &data)
qrcodegen::QrCode qrCodeUtils::generateQrCode(const QByteArray &data)
{
return qrcodegen::QrCode::encodeText(data, qrcodegen::QrCode::Ecc::LOW);
}

2
client/core/qrCodeUtils.h
View file

@ -5,7 +5,7 @@
#include "qrcodegen.hpp"
namespace qrCodeUtuls
namespace qrCodeUtils
{
constexpr const qint16 qrMagicCode = 1984;

4
client/ui/controllers/api/apiConfigsController.cpp
View file

@ -99,8 +99,8 @@ void ApiConfigsController::prepareVpnKeyExport()
auto vpnKey = apiConfigObject.value(apiDefs::key::vpnKey).toString();
auto qr = qrCodeUtuls::generateQrCode(vpnKey.toUtf8());
m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
auto qr = qrCodeUtils::generateQrCode(vpnKey.toUtf8());
m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
emit vpnKeyExportReady();
}

2
client/ui/controllers/api/apiSettingsController.h
View file

@ -4,7 +4,7 @@
#include <QObject>
#include "ui/models/api/apiAccountInfoModel.h"
#include "ui/models/apiCountryModel.h"
#include "ui/models/api/apiCountryModel.h"
#include "ui/models/servers_model.h"
class ApiSettingsController : public QObject

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

@ -50,7 +50,7 @@ void ExportController::generateFullAccessConfig()
compressedConfig = qCompress(compressedConfig, 8);
m_config = QString("vpn://%1").arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
m_qrCodes = qrCodeUtuls::generateQrCodeImageSeries(compressedConfig);
m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(compressedConfig);
emit exportConfigChanged();
}
@ -92,7 +92,7 @@ void ExportController::generateConnectionConfig(const QString &clientName)
compressedConfig = qCompress(compressedConfig, 8);
m_config = QString("vpn://%1").arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
m_qrCodes = qrCodeUtuls::generateQrCodeImageSeries(compressedConfig);
m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(compressedConfig);
emit exportConfigChanged();
}
@ -149,7 +149,7 @@ void ExportController::generateOpenVpnConfig(const QString &clientName)
m_config.append(line + "\n");
}
m_qrCodes = qrCodeUtuls::generateQrCodeImageSeries(m_config.toUtf8());
m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(m_config.toUtf8());
emit exportConfigChanged();
}
@ -167,8 +167,8 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
m_config.append(line + "\n");
}
auto qr = qrCodeUtuls::generateQrCode(m_config.toUtf8());
m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
auto qr = qrCodeUtils::generateQrCode(m_config.toUtf8());
m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
emit exportConfigChanged();
}
@ -187,8 +187,8 @@ void ExportController::generateAwgConfig(const QString &clientName)
m_config.append(line + "\n");
}
auto qr = qrCodeUtuls::generateQrCode(m_config.toUtf8());
m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
auto qr = qrCodeUtils::generateQrCode(m_config.toUtf8());
m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
emit exportConfigChanged();
}
@ -221,8 +221,8 @@ void ExportController::generateShadowSocksConfig()
m_nativeConfigString = "ss://" + m_nativeConfigString.toUtf8().toBase64();
auto qr = qrCodeUtuls::generateQrCode(m_nativeConfigString.toUtf8());
m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
auto qr = qrCodeUtils::generateQrCode(m_nativeConfigString.toUtf8());
m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
emit exportConfigChanged();
}

3
client/ui/controllers/importController.cpp
View file

@ -10,6 +10,7 @@
#include "core/api/apiDefs.h"
#include "core/api/apiUtils.h"
#include "core/errorstrings.h"
#include "core/qrCodeUtils.h"
#include "core/serialization/serialization.h"
#include "systemController.h"
#include "utilities.h"
@ -579,7 +580,7 @@ bool ImportController::parseQrCodeChunk(const QString &code)
qint16 magic;
s >> magic;
if (magic == amnezia::qrMagicCode) {
if (magic == qrCodeUtils::qrMagicCode) {
quint8 chunksCount;
s >> chunksCount;
if (m_totalQrCodeChunksCount != chunksCount) {

4
client/ui/models/apiCountryModel.cpp → client/ui/models/api/apiCountryModel.cpp
View file

@ -47,11 +47,11 @@ QVariant ApiCountryModel::data(const QModelIndex &index, int role) const
return QVariant();
}
void ApiCountryModel::updateModel(const QJsonArray &data, const QString &currentCountryCode)
void ApiCountryModel::updateModel(const QJsonArray &countries, const QString &currentCountryCode)
{
beginResetModel();
m_countries = data;
m_countries = countries;
for (int i = 0; i < m_countries.size(); i++) {
if (m_countries.at(i).toObject().value(configKey::serverCountryCode).toString() == currentCountryCode) {
m_currentIndex = i;

2
client/ui/models/apiCountryModel.h → client/ui/models/api/apiCountryModel.h
View file

@ -24,7 +24,7 @@ public:
Q_PROPERTY(int currentIndex READ getCurrentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
public slots:
void updateModel(const QJsonArray &data, const QString &currentCountryCode);
void updateModel(const QJsonArray &countries, const QString &currentCountryCode);
int getCurrentIndex();
void setCurrentIndex(const int i);