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

fix: adapt ServersBackupController to new server ID-based API

Browse Source
This commit is contained in:
NickVs2015
2026-05-29 17:27:16 +03:00
parent 471842b363
commit ffe07ff860
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/serversBackupController.cpp
+13 -9
View File
@@ -1252,13 +1252,15 @@ void ServersBackupController::createBackupWithDownload(bool downloadToDevice, bo
return; return;
} }
int serverIndex = m_serversUiController ? m_serversUiController->getProcessedServerIndex() : -1; int serverIndex = m_serversUiController
? m_serversController->indexOfServerId(m_serversUiController->getProcessedServerId())
: -1;
if (serverIndex < 0) { if (serverIndex < 0) {
emit errorOccurred(tr("No server selected"), ErrorCode::InternalError); emit errorOccurred(tr("No server selected"), ErrorCode::InternalError);
return; return;
} }
ServerCredentials credentials = m_serversUiController->getProcessedServerCredentials(); ServerCredentials credentials = m_serversController->getServerCredentials(m_serversUiController->getProcessedServerId());
// Set flags for automatic download and delete // Set flags for automatic download and delete
m_autoDownloadAfterCreate = downloadToDevice; m_autoDownloadAfterCreate = downloadToDevice;
@@ -1417,13 +1419,15 @@ void ServersBackupController::startRestore(bool isFromSetupWizard,
return; return;
} }
int serverIndex = m_serversUiController ? m_serversUiController->getProcessedServerIndex() : -1; int serverIndex = m_serversUiController
? m_serversController->indexOfServerId(m_serversUiController->getProcessedServerId())
: -1;
qDebug() << " ProcessedServerIndex:" << serverIndex; qDebug() << " ProcessedServerIndex:" << serverIndex;
qDebug() << " ServersCount:" << m_serversModel->getServersCount(); qDebug() << " ServersCount:" << m_serversController->getServersCount();
if (serverIndex < 0) { if (serverIndex < 0) {
qWarning() << "No processed server selected, trying default server"; qWarning() << "No processed server selected, trying default server";
serverIndex = m_serversModel->getDefaultServerIndex(); serverIndex = m_serversController->getDefaultServerIndex();
qDebug() << " DefaultServerIndex:" << serverIndex; qDebug() << " DefaultServerIndex:" << serverIndex;
if (serverIndex < 0) { if (serverIndex < 0) {
@@ -1452,19 +1456,19 @@ bool ServersBackupController::setDefaultServerAfterRestore(bool isFromSetupWizar
return false; return false;
} }
if (m_serversModel->getServersCount() == 0) { if (m_serversController->getServersCount() == 0) {
qWarning() << "No servers in model"; qWarning() << "No servers in model";
return false; return false;
} }
// For setup wizard, set last added server as default // For setup wizard, set last added server as default
if (isFromSetupWizard) { if (isFromSetupWizard) {
int serverIdx = m_serversModel->getServersCount() - 1; int serverIdx = m_serversController->getServersCount() - 1;
qDebug() << "Setting default server after restore:" << serverIdx; qDebug() << "Setting default server after restore:" << serverIdx;
if (m_serversUiController) { if (m_serversUiController) {
m_serversUiController->setDefaultServerAtIndex(serverIdx); m_serversUiController->setDefaultServerAtIndex(serverIdx);
} }
m_serversModel->setProcessedServerIndex(serverIdx); m_serversUiController->setProcessedServerId(m_serversController->getServerId(serverIdx));
// Reset retry counter // Reset retry counter
m_containerRetryCount = 0; m_containerRetryCount = 0;
@@ -1486,7 +1490,7 @@ void ServersBackupController::trySetDefaultContainer()
return; return;
} }
int serverIdx = m_serversModel->getServersCount() - 1; int serverIdx = m_serversController->getServersCount() - 1;
qDebug() << "Timer: Setting default container (attempt" << m_containerRetryCount + 1 << "/" << m_maxContainerRetries << ")"; qDebug() << "Timer: Setting default container (attempt" << m_containerRetryCount + 1 << "/" << m_maxContainerRetries << ")";
// Get installed containers via ServersController // Get installed containers via ServersController