AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add saving custom server name if it overridden by user (#1581)

Browse source 
* Add saving custom server name if it overridden by user

* clear duplicated code
This commit is contained in:
aiamnezia 2025-06-16 18:01:46 +04:00 • committed by GitHub
parent d3715d00ae
commit a2d30efaab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/protocols/protocols_defs.h
View file

@ -103,6 +103,8 @@ namespace amnezia
constexpr char clientId[] = "clientId"; constexpr char clientId[] = "clientId";
constexpr char nameOverriddenByUser[] = "nameOverriddenByUser";
} }
namespace protocols namespace protocols

4
client/ui/controllers/api/apiConfigsController.cpp
View file

@ -261,6 +261,10 @@ bool ApiConfigsController::updateServiceFromGateway(const int serverIndex, const
newServerConfig.insert(configKey::apiConfig, newApiConfig); newServerConfig.insert(configKey::apiConfig, newApiConfig);
newServerConfig.insert(configKey::authData, authData); newServerConfig.insert(configKey::authData, authData);
if (serverConfig.value(config_key::nameOverriddenByUser).toBool()) {
newServerConfig.insert(config_key::name, serverConfig.value(config_key::name));
newServerConfig.insert(config_key::nameOverriddenByUser, true);
}
m_serversModel->editServer(newServerConfig, serverIndex); m_serversModel->editServer(newServerConfig, serverIndex);
if (reloadServiceConfig) { if (reloadServiceConfig) {
emit reloadServerFromApiFinished(tr("API config reloaded")); emit reloadServerFromApiFinished(tr("API config reloaded"));

1
client/ui/models/servers_model.cpp
View file

@ -66,6 +66,7 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
} else { } else {
server.insert(config_key::description, value.toString()); server.insert(config_key::description, value.toString());
} }
server.insert(config_key::nameOverriddenByUser, true);
m_settings->editServer(index.row(), server); m_settings->editServer(index.row(), server);
m_servers.replace(index.row(), server); m_servers.replace(index.row(), server);
if (index.row() == m_defaultServerIndex) { if (index.row() == m_defaultServerIndex) {