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

Update configs only if the key is not empty

Browse source
This commit is contained in:
Dmitry Vorobyov 2025-04-20 11:49:08 +02:00
parent c44ce0d77c
commit 693d0eb64a
8 changed files with 134 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/ui/models/protocols/xrayConfigModel.cpp
View file

@ -2,6 +2,8 @@
#include "protocols/protocols_defs.h"
#include "ui/models/protocols/utils.h"
XrayConfigModel::XrayConfigModel(QObject *parent) : QAbstractListModel(parent)
{
}
@ -47,11 +49,20 @@ void XrayConfigModel::updateModel(const QJsonObject &config)
m_fullConfig = config;
QJsonObject protocolConfig = config.value(config_key::xray).toObject();
auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::Xray), Proto::Xray);
m_protocolConfig.insert(config_key::transport_proto,
protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::xray::defaultPort));
m_protocolConfig.insert(config_key::site, protocolConfig.value(config_key::site).toString(protocols::xray::defaultSite));
if (protocolConfig.contains(config_key::transport_proto)) {
auto transportProto = protocolConfig.value(config_key::transport_proto)
.toString(ProtocolProps::transportProtoToString(
ProtocolProps::defaultTransportProto(Proto::Xray), Proto::Xray));
m_protocolConfig[config_key::transport_proto] = transportProto;
}
const std::pair<const char *, const char *> defaults[] = {
{ config_key::port, protocols::xray::defaultPort },
{ config_key::site, protocols::xray::defaultSite },
};
for (const auto &[key, def] : defaults)
updateConfig(protocolConfig, key, def);
endResetModel();
}