From 8afe50cd87975cf7b1a5771c4c40bc73cae35cc3 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Fri, 21 Feb 2025 14:15:23 +0700 Subject: [PATCH] chore: fixed native config post processing --- client/ui/controllers/api/apiConfigsController.cpp | 3 +++ client/ui/qml/Pages2/PageSettingsApiServerInfo.qml | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/ui/controllers/api/apiConfigsController.cpp b/client/ui/controllers/api/apiConfigsController.cpp index cd3c9f1b..8c6d53c2 100644 --- a/client/ui/controllers/api/apiConfigsController.cpp +++ b/client/ui/controllers/api/apiConfigsController.cpp @@ -87,6 +87,7 @@ bool ApiConfigsController::exportNativeConfig(const QString &serverCountryCode, QJsonObject jsonConfig = QJsonDocument::fromJson(responseBody).object(); QString nativeConfig = jsonConfig.value(configKey::config).toString(); + nativeConfig.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey); SystemController::saveFile(fileName, nativeConfig); return true; @@ -124,6 +125,8 @@ void ApiConfigsController::prepareVpnKeyExport() auto vpnKey = apiConfigObject.value(apiDefs::key::vpnKey).toString(); + vpnKey.replace("vpn://", ""); + m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(vpnKey.toUtf8()); emit vpnKeyExportReady(); diff --git a/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml b/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml index 000edba7..befe7370 100644 --- a/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml +++ b/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml @@ -217,7 +217,7 @@ PageType { LabelWithButtonType { Layout.fillWidth: true - text: qsTr("How to connect on another devicey") + text: qsTr("How to connect on another device") rightImageSource: "qrc:/images/controls/chevron-right.svg" clickedFunction: function() { @@ -266,11 +266,12 @@ PageType { BasicButtonType { id: revokeButton Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 24 Layout.bottomMargin: 16 Layout.leftMargin: 8 implicitHeight: 32 + visible: footer.isVisibleForAmneziaFree + defaultColor: "transparent" hoveredColor: AmneziaStyle.color.translucentWhite pressedColor: AmneziaStyle.color.sheerWhite