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

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

6
client/ui/controllers/importController.cpp
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()) {

5
client/ui/qml/Pages2/PageSetupWizardTextKey.qml
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)
}
} }
} }
} }