AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[core] Limit server-set set settings to DonateUrl and NY

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2024-12-15 23:24:21 +03:00
parent b940009b0e
commit 5ffd2a8303
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/servers_list.cpp
View file

@ -2,6 +2,7 @@
#include "platform/http_request.hpp"
#include "platform/platform.hpp"
#include "platform/settings.hpp"
#include "base/logging.hpp"
#include "base/assert.hpp"
@ -38,9 +39,12 @@ std::optional<MetaConfig> ParseMetaConfig(std::string const & jsonStr)
const json_t * value;
json_object_foreach(settings, key, value)
{
const char * valueStr = json_string_value(value);
if (key && value)
outMetaConfig.m_settings[key] = valueStr;
if (key == settings::kDonateUrl || key == settings::kNY)
{
const char * valueStr = json_string_value(value);
if (value)
outMetaConfig.m_settings[key] = valueStr;
}
}
servers = json_object_get(root.get(), kServers);

3
platform/settings.cpp
View file

@ -23,8 +23,9 @@ using namespace std;
std::string_view kMeasurementUnits = "Units";
std::string_view kMapLanguageCode = "MapLanguageCode";
std::string_view kDeveloperMode = "DeveloperMode";
std::string_view kDonateUrl = "DonateUrl";
std::string_view kNightMode = "NightMode";
std::string_view kDonateUrl = "DonateUrl";
std::string_view kNY = "NY";
StringStorage::StringStorage() : StringStorageBase(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)) {}

4
platform/settings.hpp
View file

@ -12,8 +12,10 @@ namespace settings
extern std::string_view kMeasurementUnits;
extern std::string_view kDeveloperMode;
extern std::string_view kMapLanguageCode;
extern std::string_view kDonateUrl;
extern std::string_view kNightMode;
// The following two settings are configured externally at the metaserver.
extern std::string_view kDonateUrl;
extern std::string_view kNY;
template <class T>
bool FromString(std::string const & str, T & outValue);