dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: server with xray configs

Browse Source
This commit is contained in:
MrMirDan
2026-02-23 10:23:12 +02:00
parent b963e4d222
commit f23ee28ec9
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/ui/qml/Pages2/PageHome.qml
View File

@@ -359,8 +359,8 @@ PageType {
PageController.goToPage(PageEnum.PageSettingsApiServerInfo) PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
} }
/*} else if (ServersModel.getProcessedServerData("isConfigSelectionAvailable")) { } else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) {
PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)*/ PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)
} else { } else {
PageController.goToPage(PageEnum.PageSettingsServerInfo) PageController.goToPage(PageEnum.PageSettingsServerInfo)
} }

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

@@ -97,6 +97,8 @@ PageType {
} }
PageController.goToPage(PageEnum.PageSettingsApiServerInfo) PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
} else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) {
PageController.goToPage(PageEnum.PageSettingsXRayServerInfo)
} else { } else {
PageController.goToPage(PageEnum.PageSettingsServerInfo) PageController.goToPage(PageEnum.PageSettingsServerInfo)
} }

10
client/ui/qml/Pages2/PageSettingsXRayAvailableConfigs.qml
View File

@@ -49,7 +49,7 @@ PageType {
anchors.fill: parent anchors.fill: parent
model: XRayConfigsModel model: ServersModel
currentIndex: 0 currentIndex: 0
@@ -83,14 +83,6 @@ PageType {
headerText: root.processedServer.name headerText: root.processedServer.name
actionButtonFunction: function() { actionButtonFunction: function() {
/* TODO: chnge server info to processed
PageController.showBusyIndicator(true)
let result = ApiSettingsController.getAccountInfo(false)
PageController.showBusyIndicator(false)
if (!result) {
return
}*/
PageController.goToPage(PageEnum.PageSettingsXRayServerInfo) PageController.goToPage(PageEnum.PageSettingsXRayServerInfo)
} }
} }

4
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View File

@@ -198,8 +198,8 @@ PageType {
clickedFunc: function() { clickedFunc: function() {
if (isValidUrl(textKey.textField.text)) { if (isValidUrl(textKey.textField.text)) {
ImportController.httpGet(textKey.textField.text) ImportController.importLink(textKey.textField.text)
return PageController.goToPageHome()
} }
if (ImportController.extractConfigFromData(textKey.textField.text)) { if (ImportController.extractConfigFromData(textKey.textField.text)) {
PageController.goToPage(PageEnum.PageSetupWizardViewConfig) PageController.goToPage(PageEnum.PageSetupWizardViewConfig)