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

chore: fixed qr code with vpnkey processing

Browse source
This commit is contained in:
vladimir.kuznetsov 2025-02-21 14:15:03 +07:00
parent 5f6cd282d3
commit 48980c486e
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,9 +155,9 @@ bool ImportController::extractConfigFromData(QString data)
if (m_configType == ConfigTypes::Invalid) { if (m_configType == ConfigTypes::Invalid) {
config.replace("vpn://", ""); config.replace("vpn://", "");
QByteArray ba = QByteArray::fromBase64(config.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals); QByteArray ba = QByteArray::fromBase64(config.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
QByteArray ba_uncompressed = qUncompress(ba); QByteArray baUncompressed = qUncompress(ba);
if (!ba_uncompressed.isEmpty()) { if (!baUncompressed.isEmpty()) {
ba = ba_uncompressed; ba = baUncompressed;
} }
config = ba; config = ba;
@ -228,6 +228,21 @@ bool ImportController::extractConfigFromQr(const QByteArray &data)
return true; return true;
} }
m_configType = checkConfigFormat(data);
if (m_configType == ConfigTypes::Invalid) {
QByteArray ba = QByteArray::fromBase64(data, QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
QByteArray baUncompressed = qUncompress(ba);
if (!baUncompressed.isEmpty()) {
ba = baUncompressed;
}
if (!ba.isEmpty()) {
m_config = QJsonDocument::fromJson(ba).object();
return true;
}
}
return false; return false;
} }