Update configs only if the key is not empty

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

View file

@ -2,6 +2,8 @@
#include "protocols/protocols_defs.h"
#include "ui/models/protocols/utils.h"
CloakConfigModel::CloakConfigModel(QObject *parent) : QAbstractListModel(parent)
{
}
@ -51,11 +53,12 @@ void CloakConfigModel::updateModel(const QJsonObject &config)
m_fullConfig = config;
QJsonObject protocolConfig = config.value(config_key::cloak).toObject();
auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::Cloak), Proto::Cloak);
m_protocolConfig.insert(config_key::transport_proto, protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
m_protocolConfig.insert(config_key::cipher, protocolConfig.value(config_key::cipher).toString(protocols::cloak::defaultCipher));
m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::cloak::defaultPort));
m_protocolConfig.insert(config_key::site, protocolConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite));
auto defaultTransportProto =
ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::Cloak), Proto::Cloak);
updateConfig(protocolConfig, config_key::transport_proto, defaultTransportProto.toUtf8().constData());
updateConfig(protocolConfig, config_key::cipher, protocols::cloak::defaultCipher);
updateConfig(protocolConfig, config_key::port, protocols::cloak::defaultPort);
updateConfig(protocolConfig, config_key::site, protocols::cloak::defaultRedirSite);
endResetModel();
}