mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
update: server with xray configs
This commit is contained in:
@@ -359,8 +359,8 @@ PageType {
|
||||
|
||||
PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
|
||||
}
|
||||
/*} else if (ServersModel.getProcessedServerData("isConfigSelectionAvailable")) {
|
||||
PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)*/
|
||||
} else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) {
|
||||
PageController.goToPage(PageEnum.PageSettingsXRayAvailableConfigs)
|
||||
} else {
|
||||
PageController.goToPage(PageEnum.PageSettingsServerInfo)
|
||||
}
|
||||
|
||||
@@ -97,6 +97,8 @@ PageType {
|
||||
}
|
||||
|
||||
PageController.goToPage(PageEnum.PageSettingsApiServerInfo)
|
||||
} else if (ServersModel.getProcessedServerData("isXRayConfigSelectionAvailable")) {
|
||||
PageController.goToPage(PageEnum.PageSettingsXRayServerInfo)
|
||||
} else {
|
||||
PageController.goToPage(PageEnum.PageSettingsServerInfo)
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ PageType {
|
||||
|
||||
anchors.fill: parent
|
||||
|
||||
model: XRayConfigsModel
|
||||
model: ServersModel
|
||||
|
||||
currentIndex: 0
|
||||
|
||||
@@ -83,14 +83,6 @@ PageType {
|
||||
headerText: root.processedServer.name
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -198,8 +198,8 @@ PageType {
|
||||
|
||||
clickedFunc: function() {
|
||||
if (isValidUrl(textKey.textField.text)) {
|
||||
ImportController.httpGet(textKey.textField.text)
|
||||
return
|
||||
ImportController.importLink(textKey.textField.text)
|
||||
PageController.goToPageHome()
|
||||
}
|
||||
if (ImportController.extractConfigFromData(textKey.textField.text)) {
|
||||
PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
|
||||
|
||||
Reference in New Issue
Block a user