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

chore: minor fixes (#2630)

Browse Source
This commit is contained in:
vkamn
2026-05-21 11:38:41 +08:00
committed by GitHub
parent 9de9d082bc
commit 8749d683e3
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/controllers/api/subscriptionController.cpp
+1
View File
@@ -460,6 +460,7 @@ ErrorCode SubscriptionController::updateServiceFromGateway(const QString &server
if (apiV2->nameOverriddenByUser) { if (apiV2->nameOverriddenByUser) {
newApiV2->name = apiV2->name; newApiV2->name = apiV2->name;
newApiV2->displayName = apiV2->displayName;
newApiV2->nameOverriddenByUser = true; newApiV2->nameOverriddenByUser = true;
} }
client/core/controllers/serversController.cpp
+4
View File
@@ -44,6 +44,7 @@ bool ServersController::renameServer(const QString &serverId, const QString &nam
auto cfg = m_serversRepository->selfHostedAdminConfig(serverId); auto cfg = m_serversRepository->selfHostedAdminConfig(serverId);
if (!cfg.has_value()) return false; if (!cfg.has_value()) return false;
cfg->description = name; cfg->description = name;
cfg->displayName = name;
m_serversRepository->editServer(serverId, cfg->toJson(), kind); m_serversRepository->editServer(serverId, cfg->toJson(), kind);
return true; return true;
} }
@@ -51,6 +52,7 @@ bool ServersController::renameServer(const QString &serverId, const QString &nam
auto cfg = m_serversRepository->selfHostedUserConfig(serverId); auto cfg = m_serversRepository->selfHostedUserConfig(serverId);
if (!cfg.has_value()) return false; if (!cfg.has_value()) return false;
cfg->description = name; cfg->description = name;
cfg->displayName = name;
m_serversRepository->editServer(serverId, cfg->toJson(), kind); m_serversRepository->editServer(serverId, cfg->toJson(), kind);
return true; return true;
} }
@@ -58,6 +60,7 @@ bool ServersController::renameServer(const QString &serverId, const QString &nam
auto cfg = m_serversRepository->nativeConfig(serverId); auto cfg = m_serversRepository->nativeConfig(serverId);
if (!cfg.has_value()) return false; if (!cfg.has_value()) return false;
cfg->description = name; cfg->description = name;
cfg->displayName = name;
m_serversRepository->editServer(serverId, cfg->toJson(), kind); m_serversRepository->editServer(serverId, cfg->toJson(), kind);
return true; return true;
} }
@@ -67,6 +70,7 @@ bool ServersController::renameServer(const QString &serverId, const QString &nam
auto cfg = m_serversRepository->apiV2Config(serverId); auto cfg = m_serversRepository->apiV2Config(serverId);
if (!cfg.has_value()) return false; if (!cfg.has_value()) return false;
cfg->name = name; cfg->name = name;
cfg->displayName = name;
cfg->nameOverriddenByUser = true; cfg->nameOverriddenByUser = true;
m_serversRepository->editServer(serverId, cfg->toJson(), kind); m_serversRepository->editServer(serverId, cfg->toJson(), kind);
return true; return true;
client/core/controllers/updateController.cpp
+2 -10
View File
@@ -196,16 +196,8 @@ void UpdateController::setupNetworkErrorHandling(QNetworkReply* reply, const QSt
void UpdateController::handleNetworkError(QNetworkReply* reply, const QString& operation) void UpdateController::handleNetworkError(QNetworkReply* reply, const QString& operation)
{ {
if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError logger.error() << "Network error code:" << QString::number(static_cast<int>(reply->error()));
|| reply->error() == QNetworkReply::NetworkError::TimeoutError) { logger.error() << "HTTP status:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
logger.error() << errorString(ErrorCode::ApiConfigTimeoutError);
} else {
QString err = reply->errorString();
logger.error() << "Network error code:" << QString::number(static_cast<int>(reply->error()));
logger.error() << "Error message:" << err;
logger.error() << "HTTP status:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
logger.error() << errorString(ErrorCode::ApiConfigDownloadError);
}
} }
QString UpdateController::composeDownloadUrl() const QString UpdateController::composeDownloadUrl() const