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

added protocol_defs for new config keywords

Browse source
This commit is contained in:
vladimir.kuznetsov 2022-11-01 23:24:58 +03:00
parent 53d7a92a0d
commit 1a44307664
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/protocols/protocols_defs.h
View file

@ -58,6 +58,11 @@ constexpr char additional_server_config[] = "additional_server_config";
// proto config keys // proto config keys
constexpr char last_config[] = "last_config"; constexpr char last_config[] = "last_config";
constexpr char is_third_party_config[] = "is_third_party_config";
constexpr char openvpn[] = "openvpn";
} }
namespace protocols { namespace protocols {

2
client/settings.cpp
View file

@ -317,5 +317,5 @@ bool Settings::isThirdPartyConfig(int serverIndex) const
{ {
if (serverIndex < 0) return false; if (serverIndex < 0) return false;
const QJsonObject &s = server(serverIndex); const QJsonObject &s = server(serverIndex);
return s.value("isThirdPartyConfig").toBool(); return s.value(config_key::is_third_party_config).toBool();
} }

4
client/ui/pages_logic/StartPageLogic.cpp
View file

@ -249,7 +249,7 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
QJsonObject containers; QJsonObject containers;
containers.insert(config_key::container, QJsonValue("amnezia-openvpn")); containers.insert(config_key::container, QJsonValue("amnezia-openvpn"));
containers.insert("openvpn", QJsonValue(lastConfig)); containers.insert(config_key::openvpn, QJsonValue(lastConfig));
QJsonArray arr; QJsonArray arr;
arr.push_back(containers); arr.push_back(containers);
@ -275,7 +275,7 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
o[config_key::hostName] = hostNameMatch.captured(0).split(" ").at(1); o[config_key::hostName] = hostNameMatch.captured(0).split(" ").at(1);
} }
o["isThirdPartyConfig"] = true; o[config_key::is_third_party_config] = true;
return importConnection(o); return importConnection(o);
} }