dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: minor fixes (#2524)

Browse Source 
* fix: fixed i5 empty check

* fix: add check config format in extractConfigFromQr
This commit is contained in:
vkamn
2026-04-27 13:18:50 +08:00
committed by GitHub
parent f0da2b003f
commit 2edd7de413
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
set(PROJECT AmneziaVPN) set(PROJECT AmneziaVPN)
set(AMNEZIAVPN_VERSION 4.8.15.2) set(AMNEZIAVPN_VERSION 4.8.15.4)
project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION} project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION}
DESCRIPTION "AmneziaVPN" DESCRIPTION "AmneziaVPN"
@@ -12,7 +12,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
set(RELEASE_DATE "${CURRENT_DATE}") set(RELEASE_DATE "${CURRENT_DATE}")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
set(APP_ANDROID_VERSION_CODE 2119) set(APP_ANDROID_VERSION_CODE 2120)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(MZ_PLATFORM_NAME "linux") set(MZ_PLATFORM_NAME "linux")

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

@@ -217,6 +217,8 @@ bool ImportController::extractConfigFromData(QString data)
bool ImportController::extractConfigFromQr(const QByteArray &data) bool ImportController::extractConfigFromQr(const QByteArray &data)
{ {
m_configType = checkConfigFormat(QString::fromUtf8(data));
QJsonObject dataObj = QJsonDocument::fromJson(data).object(); QJsonObject dataObj = QJsonDocument::fromJson(data).object();
if (!dataObj.isEmpty()) { if (!dataObj.isEmpty()) {
m_config = dataObj; m_config = dataObj;
@@ -226,10 +228,13 @@ bool ImportController::extractConfigFromQr(const QByteArray &data)
QByteArray ba_uncompressed = qUncompress(data); QByteArray ba_uncompressed = qUncompress(data);
if (!ba_uncompressed.isEmpty()) { if (!ba_uncompressed.isEmpty()) {
m_config = QJsonDocument::fromJson(ba_uncompressed).object(); m_config = QJsonDocument::fromJson(ba_uncompressed).object();
if (m_config.isEmpty()) {
return false;
}
m_configType = checkConfigFormat(QString::fromUtf8(ba_uncompressed));
return true; return true;
} }
m_configType = checkConfigFormat(data);
if (m_configType == ConfigTypes::Invalid) { if (m_configType == ConfigTypes::Invalid) {
QByteArray ba = QByteArray::fromBase64(data, QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals); QByteArray ba = QByteArray::fromBase64(data, QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
QByteArray baUncompressed = qUncompress(ba); QByteArray baUncompressed = qUncompress(ba);
@@ -240,6 +245,10 @@ bool ImportController::extractConfigFromQr(const QByteArray &data)
if (!ba.isEmpty()) { if (!ba.isEmpty()) {
m_config = QJsonDocument::fromJson(ba).object(); m_config = QJsonDocument::fromJson(ba).object();
if (m_config.isEmpty()) {
return false;
}
m_configType = checkConfigFormat(QString::fromUtf8(ba));
return true; return true;
} }
} }

1
client/ui/qml/Pages2/PageProtocolAwgSettings.qml
View File

@@ -482,6 +482,7 @@ PageType {
headerText: qsTr("I5 - Special junk 5") headerText: qsTr("I5 - Special junk 5")
textField.text: serverSpecialJunk5 textField.text: serverSpecialJunk5
checkEmptyText: false
textField.onEditingFinished: { textField.onEditingFinished: {
if (textField.text !== serverSpecialJunk5) { if (textField.text !== serverSpecialJunk5) {