rms/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-17 08:16:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

cleanup commented lines

Browse Source
This commit is contained in:
Mitternacht822
2026-01-30 17:18:38 +04:00
parent dec1f51fd6
commit 6d798344d2
3 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/core/controllers/gatewayController.cpp
View File

@@ -239,23 +239,6 @@ QStringList GatewayController::getProxyUrls()
proxyStorageUrls = QString(DEV_S3_ENDPOINT).split(", ");
} else {
proxyStorageUrls = QString(PROD_S3_ENDPOINT).split(", ");
// Build and sanitize proxy storage endpoints list from env-based macros
/*QString endpointsStr = m_isDevEnvironment ? QString(DEV_S3_ENDPOINT) : QString(PROD_S3_ENDPOINT);
// Split on commas with optional whitespace and skip empty parts
QStringList proxyStorageUrls = endpointsStr.split(QRegularExpression("\\s*,\\s*"), Qt::SkipEmptyParts);
// Filter out invalid/empty URLs defensively
proxyStorageUrls.erase(std::remove_if(proxyStorageUrls.begin(),
proxyStorageUrls.end(),
[](const QString &s) {
QUrl u(s);
return s.trimmed().isEmpty() || !u.isValid() || u.scheme().isEmpty();
}),
proxyStorageUrls.end());
if (proxyStorageUrls.isEmpty()) {
// No valid endpoints configured; skip storage probing
return {};*/
}
QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;

15
client/ui/controllers/importController.cpp
View File

@@ -576,17 +576,6 @@ static QMutex qrDecodeMutex;
// static
bool ImportController::decodeQrCode(const QString &code)
{
//old version
/*QMutexLocker lock(&qrDecodeMutex);
if (!mInstance->m_isQrCodeProcessed) {
mInstance->m_qrCodeChunks.clear();
mInstance->m_isQrCodeProcessed = true;
mInstance->m_totalQrCodeChunksCount = 0;
mInstance->m_receivedQrCodeChunksCount = 0;
}
return mInstance->parseQrCodeChunk(code);*/
QMutexLocker lock(&qrDecodeMutex);
if (!mInstance->m_isQrCodeProcessed) {
@@ -604,8 +593,8 @@ bool ImportController::decodeQrCode(const QString &code)
if (obj.contains(QStringLiteral("gw"))
&& (obj.contains(QStringLiteral("uuid")) || obj.contains(QStringLiteral("u")))) {
// это наш QR для передачи устройства
mInstance->m_isQrCodeProcessed = false; // reset state
emit mInstance->transferQrDecoded(code); // send string to QML
mInstance->m_isQrCodeProcessed = false;
emit mInstance->transferQrDecoded(code);
return true;
}
}

3
client/ui/controllers/transferController.h
View File

@@ -18,7 +18,6 @@ class TransferController : public QObject
Q_PROPERTY(QString qrCodeUrl READ qrCodeUrl NOTIFY qrCodeUpdated)
Q_PROPERTY(QString pendingQrCode READ pendingQrCode WRITE setPendingQrCode NOTIFY pendingQrCodeChanged)
// Debug / manual transfer support (temporary): expose UUID and payload JSON used to generate the QR code.
Q_PROPERTY(QString currentUuid READ currentUuid NOTIFY currentUuidChanged)
Q_PROPERTY(QString currentPayload READ currentPayload NOTIFY currentPayloadChanged)
@@ -37,7 +36,6 @@ public:
Q_INVOKABLE void setPendingQrCode(const QString &code) { m_pendingQrCode = code; emit pendingQrCodeChanged(); }
QString pendingQrCode() const { return m_pendingQrCode; }
// Waiting for config on receiver device
Q_INVOKABLE void startWaitForConfig(ImportController *importController);
Q_INVOKABLE void stopWaitForConfig();
@@ -64,7 +62,6 @@ private slots:
private:
QString buildQrPayloadJson(const QString &gatewayUrl, const QString &uuid) const;
//QString getPremiumConfigToSend() const;
QString m_pendingQrCode;
QString getCurrentApiKey(QString *vpnKeyOut = nullptr) const;
std::shared_ptr<Settings> m_settings;