fixed xray port processing (#983)

* fixed xray port processing

* fixed saving port when changing xray settings and saving transport protocol when changing all the protocols settings
This commit is contained in:
Nethius 2024-08-19 16:17:09 +07:00 committed by GitHub
parent a1e68f5506
commit 6c5d590169
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 70 additions and 107 deletions

View file

@ -35,8 +35,7 @@ QVariant Ikev2ConfigModel::data(const QModelIndex &index, int role) const
switch (role) {
case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
case Roles::CipherRole:
return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
case Roles::CipherRole: return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
}
return QVariant();
@ -50,11 +49,8 @@ void Ikev2ConfigModel::updateModel(const QJsonObject &config)
m_fullConfig = config;
QJsonObject protocolConfig = config.value(config_key::shadowsocks).toObject();
m_protocolConfig.insert(config_key::cipher,
protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
m_protocolConfig.insert(config_key::port,
protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
m_protocolConfig.insert(config_key::cipher, protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
endResetModel();
}