kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Do not store good servers list in the settings. Otherwise if servers have changed, old outdated servers will be loaded from settings and downloading will fail.

Browse source
This commit is contained in:
Alex Zolotarev 2015-07-29 16:03:49 +03:00
parent 7ccf4a90bd
commit 1729c30fcb
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
platform/servers_list.cpp
View file

@ -8,13 +8,10 @@
#include "3party/jansson/myjansson.hpp"
#define SETTINGS_SERVERS_KEY "LastBaseUrls"
namespace downloader
{
// Returns false if can't parse urls. Note that it also clears outUrls.
bool ParseServerList(string const & jsonStr, vector<string> & outUrls)
{
outUrls.clear();
@ -37,20 +34,15 @@ bool ParseServerList(string const & jsonStr, vector<string> & outUrls)
void GetServerListFromRequest(HttpRequest const & request, vector<string> & urls)
{
if (request.Status() == HttpRequest::ECompleted &&
ParseServerList(request.Data(), urls))
if (request.Status() == HttpRequest::ECompleted && ParseServerList(request.Data(), urls))
{
Settings::Set(SETTINGS_SERVERS_KEY, request.Data());
return;
}
else
{
LOG(LWARNING, ("Can't get servers list from request"));
string serverList;
if (!Settings::Get(SETTINGS_SERVERS_KEY, serverList))
serverList = GetPlatform().DefaultUrlsJSON();
VERIFY ( ParseServerList(serverList, urls), () );
VERIFY(ParseServerList(GetPlatform().DefaultUrlsJSON(), urls), ());
LOG(LWARNING, ("Can't get servers list from request, using default servers:", urls));
}
}
}
} // namespace downloader