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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2018-10-26 14:57:47 +03:00 • committed by Aleksey Belousov
parent ca9488e113
commit e2f510d63a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
View file

@ -473,8 +473,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
if (observer)
[observer onDownloadStart];
};
auto onDownloadFinished = [](std::string const & serverCatId, BookmarkCatalog::DownloadResult result,
std::string const & description)
auto onDownloadFinished = [](std::string const & serverCatId, BookmarkCatalog::DownloadResult result)
{
auto observer = [MWMBookmarksManager manager].catalogObservers[@(serverCatId.c_str())];
if (observer)

4
map/bookmark_manager.cpp
View file

@ -2127,8 +2127,10 @@ void BookmarkManager::DownloadFromCatalogAndImport(std::string const & id, std::
[this, id](BookmarkCatalog::DownloadResult result, std::string const & desc,
std::string const & filePath)
{
UNUSED_VALUE(desc);
if (m_onCatalogDownloadFinished)
m_onCatalogDownloadFinished(id, result, desc);
m_onCatalogDownloadFinished(id, result);
if (result == BookmarkCatalog::DownloadResult::Success)
ImportDownloadedFromCatalog(id, filePath);

3
map/bookmark_manager.hpp
View file

@ -287,8 +287,7 @@ public:
using OnCatalogDownloadStartedHandler = platform::SafeCallback<void(std::string const & id)>;
using OnCatalogDownloadFinishedHandler = platform::SafeCallback<void(std::string const & id,
BookmarkCatalog::DownloadResult result,
std::string const & description)>;
BookmarkCatalog::DownloadResult result)>;
using OnCatalogImportStartedHandler = platform::SafeCallback<void(std::string const & id)>;
using OnCatalogImportFinishedHandler = platform::SafeCallback<void(std::string const & id,
kml::MarkGroupId categoryId,