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

extended the validation of the contents of the imported file (#670)

Browse source 
Extended the validation of the contents of the imported file
This commit is contained in:
Nethius 2024-03-14 04:22:10 +07:00 • committed by GitHub
parent 0a90fd110d
commit c5a5bfde69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 109 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View file

@ -73,12 +73,7 @@ PageType {
"Config files (*.vpn *.ovpn *.conf)"
var fileName = SystemController.getFileName(qsTr("Open config file"), nameFilter)
if (fileName !== "") {
if (fileName.indexOf(".backup") !== -1 && !ServersModel.getServersCount()) {
PageController.showBusyIndicator(true)
SettingsController.restoreAppConfig(fileName)
PageController.showBusyIndicator(false)
} else {
ImportController.extractConfigFromFile(fileName)
if (ImportController.extractConfigFromFile(fileName)) {
PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
}
}

14
client/ui/qml/Pages2/PageSetupWizardStart.qml
View file

@ -81,6 +81,20 @@ PageType {
}
}
Connections {
target: ImportController
function onRestoreAppConfig(data) {
PageController.showBusyIndicator(true)
SettingsController.restoreAppConfigFromData(data)
PageController.showBusyIndicator(false)
}
function onImportErrorOccurred(errorMessage) {
PageController.showErrorMessage(errorMessage)
}
}
FlickableType {
id: fl
anchors.top: parent.top

2
client/ui/qml/Pages2/PageSetupWizardTextKey.qml
View file

@ -77,7 +77,7 @@ PageType {
text: qsTr("Continue")
clickedFunc: function() {
ImportController.extractConfigFromCode(textKey.textFieldText)
ImportController.extractConfigFromData(textKey.textFieldText)
PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
}
}

8
client/ui/qml/Pages2/PageStart.qml
View file

@ -121,6 +121,14 @@ PageType {
}
}
Connections {
target: ImportController
function onImportErrorOccurred(errorMessage) {
PageController.showErrorMessage(errorMessage)
}
}
StackViewType {
id: tabBarStackView