andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-21 02:01:03 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: replace ServersModel.getProcessedServerData with ServersUiController API in backup/restore pages

Browse Source
This commit is contained in:
NickVs2015
2026-05-29 17:31:22 +03:00
parent ffe07ff860
commit 303cd58354
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/qml/Pages2/PageSettingsServerBackup.qml
+3 -3
View File
@@ -160,10 +160,10 @@ PageType {
// If IP not found in filename, use current server
if (!serverIp || serverIp.length === 0) {
serverIp = ServersModel.getProcessedServerData("hostName") || ""
serverIp = ServersUiController.serverHostName(ServersUiController.processedServerId) || ""
}
var serverName = ServersModel.getProcessedServerData("name") || qsTr("Server")
var serverName = ServersUiController.serverName(ServersUiController.processedServerId) || qsTr("Server")
// Open restore mode selection page
var parentItem = root.parent
client/ui/qml/Pages2/PageSettingsServerRestoreMode.qml
+4 -8
View File
@@ -170,15 +170,11 @@ PageType {
// Navigate to successful restore page
// Get actual server name from model
var actualServerName = serverName
if (root.isFromSetupWizard && ServersModel.getServersCount() > 0) {
var serverIdx = ServersModel.getServersCount() - 1
var oldProcessedIndex = ServersModel.processedIndex
ServersModel.processedIndex = serverIdx
actualServerName = ServersModel.getProcessedServerData("name") || qsTr("Server")
ServersModel.processedIndex = oldProcessedIndex
if (root.isFromSetupWizard && ServersUiController.getServersCount() > 0) {
var lastServerId = ServersUiController.getServerId(ServersUiController.getServersCount() - 1)
actualServerName = ServersUiController.serverName(lastServerId) || qsTr("Server")
} else if (!serverName || serverName.length === 0) {
// If name not provided, get from processedIndex
actualServerName = ServersModel.getProcessedServerData("name") || qsTr("Server")
actualServerName = ServersUiController.serverName(ServersUiController.processedServerId) || qsTr("Server")
}
var parentItem = root.parent