github-personal/amnezia-client
1
0
Fork 0
mirror of https://github.com/outbackdingo/amnezia-client.git synced 2026-01-27 02:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed error handling for config import

Browse Source
This commit is contained in:
vladimir.kuznetsov
2024-03-21 23:29:40 +05:00
parent 516e3da7e2
commit 02f186c54e
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/ui/controllers/importController.cpp
View File

@@ -79,7 +79,7 @@ bool ImportController::extractConfigFromFile(const QString &fileName)
return extractConfigFromData(data);
}
emit importErrorOccurred(tr("Unable to open file"));
emit importErrorOccurred(tr("Unable to open file"), false);
return false;
}
@@ -117,12 +117,12 @@ bool ImportController::extractConfigFromData(QString data)
if (!m_serversModel->getServersCount()) {
emit restoreAppConfig(config.toUtf8());
} else {
emit importErrorOccurred(tr("Invalid configuration file"));
emit importErrorOccurred(tr("Invalid configuration file"), false);
}
break;
}
case ConfigTypes::Invalid: {
emit importErrorOccurred(tr("Invalid configuration file"));
emit importErrorOccurred(tr("Invalid configuration file"), false);
break;
}
}
@@ -257,6 +257,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
} else {
qDebug() << "Key parameter 'Endpoint' is missing";
emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError), false);
return QJsonObject();
}
if (hostNameAndPortMatch.hasCaptured(2)) {
@@ -282,7 +283,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
lastConfig[config_key::server_pub_key] = configMap.value("PublicKey");
} else {
qDebug() << "One of the key parameters is missing (PrivateKey, Address, PublicKey)";
emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError), false);
return QJsonObject();
}

1
client/ui/controllers/importController.h
View File

@@ -39,7 +39,6 @@ public slots:
signals:
void importFinished();
void importErrorOccurred(const QString &errorMessage, bool goToPageHome);
void importErrorOccurred(const QString &errorMessage);
void qrDecodingFinished();

2
client/ui/qml/Pages2/PageSetupWizardStart.qml
View File

@@ -90,7 +90,7 @@ PageType {
PageController.showBusyIndicator(false)
}
function onImportErrorOccurred(errorMessage) {
function onImportErrorOccurred(errorMessage, goToPageHome) {
PageController.showErrorMessage(errorMessage)
}
}

1
client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
View File

@@ -24,7 +24,6 @@ PageType {
} else {
PageController.closePage()
}
PageController.showErrorMessage(errorMessage)
}
function onImportFinished() {

2
client/ui/qml/Pages2/PageStart.qml
View File

@@ -124,7 +124,7 @@ PageType {
Connections {
target: ImportController
function onImportErrorOccurred(errorMessage) {
function onImportErrorOccurred(errorMessage, goToPageHome) {
PageController.showErrorMessage(errorMessage)
}
}