From 1fa152845c543511f04053a15cbf1a093553a665 Mon Sep 17 00:00:00 2001 From: Mitternacht822 Date: Thu, 26 Feb 2026 18:31:18 +0400 Subject: [PATCH] fix: generate native awg config as qr series (#2221) --- client/ui/controllers/exportController.cpp | 7 ++----- client/ui/qml/Pages2/PageShare.qml | 8 +++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp index 993ff7c78..cdaead402 100644 --- a/client/ui/controllers/exportController.cpp +++ b/client/ui/controllers/exportController.cpp @@ -7,7 +7,6 @@ #include #include #include - #include "core/controllers/vpnConfigurationController.h" #include "core/qrCodeUtils.h" #include "core/serialization/serialization.h" @@ -170,8 +169,7 @@ void ExportController::generateWireGuardConfig(const QString &clientName) m_config.append(line + "\n"); } - auto qr = qrCodeUtils::generateQrCode(m_config.toUtf8()); - m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1))); + m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(m_config.toUtf8()); emit exportConfigChanged(); } @@ -191,8 +189,7 @@ void ExportController::generateAwgConfig(const QString &clientName) m_config.append(line + "\n"); } - auto qr = qrCodeUtils::generateQrCode(m_config.toUtf8()); - m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1))); + m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(m_config.toUtf8()); emit exportConfigChanged(); } diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml index 4b36c93f0..3de4bd86e 100644 --- a/client/ui/qml/Pages2/PageShare.qml +++ b/client/ui/qml/Pages2/PageShare.qml @@ -505,7 +505,13 @@ PageType { exportTypeSelector.currentIndex = 0 } selectedIndex = exportTypeSelector.currentIndex - exportTypeSelector.text = selectedText + if (model.length > 0 && model[selectedIndex] && model[selectedIndex].name !== undefined) { + exportTypeSelectorListView.selectedText = model[selectedIndex].name + exportTypeSelector.text = model[selectedIndex].name + } else { + exportTypeSelectorListView.selectedText = "" + exportTypeSelector.text = "" + } } rootWidth: root.width