andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

added error handling for importing a native config

Browse Source
This commit is contained in:
vladimir.kuznetsov
2024-03-14 12:55:33 +05:00
parent 915fb6759a
commit 33f49bfddb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/importController.cpp
+3 -3
View File
@@ -103,15 +103,15 @@ bool ImportController::extractConfigFromData(QString data)
switch (configFormat) { switch (configFormat) {
case ConfigTypes::OpenVpn: { case ConfigTypes::OpenVpn: {
m_config = extractOpenVpnConfig(config); m_config = extractOpenVpnConfig(config);
return true; return m_config.empty() ? false : true;
} }
case ConfigTypes::WireGuard: { case ConfigTypes::WireGuard: {
m_config = extractWireGuardConfig(config); m_config = extractWireGuardConfig(config);
return true; return m_config.empty() ? false : true;
} }
case ConfigTypes::Amnezia: { case ConfigTypes::Amnezia: {
m_config = QJsonDocument::fromJson(config.toUtf8()).object(); m_config = QJsonDocument::fromJson(config.toUtf8()).object();
return true; return m_config.empty() ? false : true;
} }
case ConfigTypes::Backup: { case ConfigTypes::Backup: {
if (!m_serversModel->getServersCount()) { if (!m_serversModel->getServersCount()) {
client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+3 -2
View File
@@ -77,8 +77,9 @@ PageType {
text: qsTr("Continue") text: qsTr("Continue")
clickedFunc: function() { clickedFunc: function() {
ImportController.extractConfigFromData(textKey.textFieldText) if (ImportController.extractConfigFromData(textKey.textFieldText)) {
PageController.goToPage(PageEnum.PageSetupWizardViewConfig) PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
}
} }
} }
} }