diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h index c158822d1..9e121f568 100644 --- a/client/protocols/protocols_defs.h +++ b/client/protocols/protocols_defs.h @@ -58,6 +58,11 @@ constexpr char additional_server_config[] = "additional_server_config"; // proto config keys constexpr char last_config[] = "last_config"; + +constexpr char is_third_party_config[] = "is_third_party_config"; + +constexpr char openvpn[] = "openvpn"; + } namespace protocols { diff --git a/client/settings.cpp b/client/settings.cpp index ccef9e403..8202eb277 100644 --- a/client/settings.cpp +++ b/client/settings.cpp @@ -317,5 +317,5 @@ bool Settings::isThirdPartyConfig(int serverIndex) const { if (serverIndex < 0) return false; const QJsonObject &s = server(serverIndex); - return s.value("isThirdPartyConfig").toBool(); + return s.value(config_key::is_third_party_config).toBool(); } diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp index 6a6333e96..897caaaf9 100644 --- a/client/ui/pages_logic/StartPageLogic.cpp +++ b/client/ui/pages_logic/StartPageLogic.cpp @@ -249,7 +249,7 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config) QJsonObject containers; containers.insert(config_key::container, QJsonValue("amnezia-openvpn")); - containers.insert("openvpn", QJsonValue(lastConfig)); + containers.insert(config_key::openvpn, QJsonValue(lastConfig)); QJsonArray arr; 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["isThirdPartyConfig"] = true; + o[config_key::is_third_party_config] = true; return importConnection(o); }