rms/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-17 00:06:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: deactivate api config before remove (#2569)

Browse Source 
Co-authored-by: vkamn <vk@amnezia.org>
This commit is contained in:
yp
2026-05-15 09:56:09 +03:00
committed by GitHub
parent fd0c773918
commit d0a1af0381
6 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/core/controllers/api/subscriptionController.cpp
View File

@@ -679,6 +679,27 @@ void SubscriptionController::removeApiConfig(const QString &serverId)
serverConfigUtils::configTypeFromJson(apiV2->toJson()));
}
bool SubscriptionController::removeServer(const QString &serverId)
{
if (serverId.isEmpty()) {
return false;
}
if (!m_serversRepository->apiV2Config(serverId).has_value()) {
qWarning().noquote() << "SubscriptionController::removeServer: not an Api V2 server, id" << serverId;
return false;
}
const ErrorCode revokeError = deactivateDevice(serverId);
if (revokeError != ErrorCode::NoError && revokeError != ErrorCode::ApiNotFoundError) {
qWarning().noquote() << "SubscriptionController::removeServer: deactivateDevice failed (error"
<< static_cast<int>(revokeError) << "); removing locally anyway.";
}
m_serversRepository->removeServer(serverId);
return true;
}
bool SubscriptionController::isApiKeyExpired(const QString &serverId) const
{
auto apiV2 = m_serversRepository->apiV2Config(serverId);

2
client/core/controllers/api/subscriptionController.h
View File

@@ -74,6 +74,8 @@ public:
void removeApiConfig(const QString &serverId);
bool removeServer(const QString &serverId);
void setCurrentProtocol(const QString &serverId, const QString &protocolName);
bool isVlessProtocol(const QString &serverId) const;

9
client/ui/controllers/api/subscriptionUiController.cpp
View File

@@ -406,6 +406,15 @@ void SubscriptionUiController::removeApiConfig(const QString &serverId)
emit apiConfigRemoved(tr("Api config removed"));
}
void SubscriptionUiController::removeServer(const QString &serverId)
{
const QString serverName = m_serversController->notificationDisplayName(serverId);
if (!m_subscriptionController->removeServer(serverId)) {
return;
}
emit apiServerRemoved(tr("Server '%1' was removed").arg(serverName));
}
QList<QString> SubscriptionUiController::getQrCodes()
{

3
client/ui/controllers/api/subscriptionUiController.h
View File

@@ -58,6 +58,8 @@ public slots:
void removeApiConfig(const QString &serverId);
void removeServer(const QString &serverId);
bool getAccountInfo(const QString &serverId, bool reload);
void getRenewalLink(const QString &serverId);
@@ -78,6 +80,7 @@ signals:
void subscriptionRefreshNeeded();
void apiConfigRemoved(const QString &message);
void apiServerRemoved(const QString &message);
void vpnKeyExportReady();

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

@@ -506,7 +506,7 @@ PageType {
PageController.showNotificationMessage(qsTr("Cannot remove server during active connection"))
} else {
PageController.showBusyIndicator(true)
InstallController.removeServer(ServersUiController.getServerId(ServersUiController.processedServerIndex))
SubscriptionUiController.removeServer(ServersUiController.getServerId(ServersUiController.processedServerIndex))
PageController.showBusyIndicator(false)
}
}

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

@@ -224,6 +224,16 @@ PageType {
PageController.showNotificationMessage(message)
}
function onApiServerRemoved(message) {
if (!ServersModel.getServersCount()) {
PageController.goToPageHome()
} else {
PageController.goToStartPage()
PageController.goToPage(PageEnum.PageSettingsServersList)
}
PageController.showNotificationMessage(message)
}
function onInstallServerFromApiFinished(message, preferredDefaultIndex) {
if (!ConnectionController.isConnected) {
if (preferredDefaultIndex !== undefined && preferredDefaultIndex >= 0) {