mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
fixed QR scaner
This commit is contained in:
@@ -30,7 +30,7 @@ bool isLocalGatewayHost(const QString &gatewayUrl)
|
||||
|| gatewayUrl.contains(QStringLiteral("::1"), Qt::CaseInsensitive)) {
|
||||
return true;
|
||||
}
|
||||
#ifdef AMNEZIA_LAN_PLAINTEXT_GATEWAY
|
||||
#ifdef AMNEZIA_QR_PAIRING_ALLOW
|
||||
const QUrl u(gatewayUrl);
|
||||
return NetworkUtilities::hostIsPrivateLanAddress(u.host());
|
||||
#else
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#include "subscriptionController.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
#include <QDateTime>
|
||||
#include <QEventLoop>
|
||||
@@ -339,9 +338,7 @@ ErrorCode SubscriptionController::importServerFromQrPairingResponse(const QStrin
|
||||
if (duplicateServerIndex) {
|
||||
*duplicateServerIndex = i;
|
||||
}
|
||||
#ifndef AMNEZIA_QR_PAIRING_ALLOW_DUPLICATE_VPN_KEY
|
||||
return ErrorCode::ApiConfigAlreadyAdded;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -387,24 +384,6 @@ ErrorCode SubscriptionController::importServerFromQrPairingResponse(const QStrin
|
||||
apiV2->apiConfig.vpnKey = fullKey;
|
||||
}
|
||||
|
||||
#ifdef AMNEZIA_QR_PAIRING_ALLOW_DUPLICATE_VPN_KEY
|
||||
static int existingSameKeyCount = 0;
|
||||
if (apiV2) {
|
||||
++existingSameKeyCount;
|
||||
const QString suffix = QCoreApplication::translate("SubscriptionController", " (paired copy %1)")
|
||||
.arg(existingSameKeyCount);
|
||||
|
||||
if (!apiV2->name.isEmpty()) {
|
||||
apiV2->name += suffix;
|
||||
} else if (!apiV2->description.isEmpty()) {
|
||||
apiV2->description += suffix;
|
||||
} else {
|
||||
apiV2->name = QCoreApplication::translate("SubscriptionController", "Paired subscription %1")
|
||||
.arg(existingSameKeyCount);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
m_serversRepository->addServer(serverConfigModel);
|
||||
serverConfig = serverConfigModel;
|
||||
return ErrorCode::NoError;
|
||||
|
||||
Reference in New Issue
Block a user