From 33f49bfddb060f815f223f17a5e29998d3841f52 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Thu, 14 Mar 2024 12:55:33 +0500 Subject: [PATCH] added error handling for importing a native config --- client/ui/controllers/importController.cpp | 6 +++--- client/ui/qml/Pages2/PageSetupWizardTextKey.qml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp index b33954bf..9522cfbe 100644 --- a/client/ui/controllers/importController.cpp +++ b/client/ui/controllers/importController.cpp @@ -103,15 +103,15 @@ bool ImportController::extractConfigFromData(QString data) switch (configFormat) { case ConfigTypes::OpenVpn: { m_config = extractOpenVpnConfig(config); - return true; + return m_config.empty() ? false : true; } case ConfigTypes::WireGuard: { m_config = extractWireGuardConfig(config); - return true; + return m_config.empty() ? false : true; } case ConfigTypes::Amnezia: { m_config = QJsonDocument::fromJson(config.toUtf8()).object(); - return true; + return m_config.empty() ? false : true; } case ConfigTypes::Backup: { if (!m_serversModel->getServersCount()) { diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml index 30cd8b89..064d30ed 100644 --- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml +++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml @@ -77,8 +77,9 @@ PageType { text: qsTr("Continue") clickedFunc: function() { - ImportController.extractConfigFromData(textKey.textFieldText) - PageController.goToPage(PageEnum.PageSetupWizardViewConfig) + if (ImportController.extractConfigFromData(textKey.textFieldText)) { + PageController.goToPage(PageEnum.PageSetupWizardViewConfig) + } } } }