diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp index e2e5fd22ec..9eefd7333a 100644 --- a/android/jni/com/mapswithme/maps/MapManager.cpp +++ b/android/jni/com/mapswithme/maps/MapManager.cpp @@ -342,19 +342,6 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeIsDownloading(JNIEnv * env, return static_cast(GetStorage().IsDownloadInProgress()); } -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_downloader_MapManager_nativeGetCurrentDownloadingCountryId(JNIEnv * env, jclass) -{ - auto const & downloadingCountries = GetStorage().GetCurrentDownloadingCountries(); - - if (downloadingCountries.empty()) - return nullptr; - - ASSERT_EQUAL(downloadingCountries.size(), 1, ()); - - return jni::ToJavaString(env, downloadingCountries.begin()->first); -} - static void StartBatchingCallbacks() { CHECK_THREAD_CHECKER(g_batchingThreadChecker, ("StartBatchingCallbacks")); diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java index 64f18188d3..5b300b6fae 100644 --- a/android/src/com/mapswithme/maps/downloader/MapManager.java +++ b/android/src/com/mapswithme/maps/downloader/MapManager.java @@ -329,9 +329,6 @@ public final class MapManager */ public static native boolean nativeIsDownloading(); - @Nullable - public static native String nativeGetCurrentDownloadingCountryId(); - /** * Enqueues given {@code root} node and its children in downloader. */ diff --git a/map/framework.cpp b/map/framework.cpp index aa8cfc177e..cad4241d8d 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -385,9 +385,9 @@ Framework::Framework(FrameworkParams const & params) InitCityFinder(); // Init storage with needed callback. - m_storage.Init( - bind(&Framework::OnCountryFileDownloaded, this, _1, _2), + m_storage.Init(bind(&Framework::OnCountryFileDownloaded, this, _1, _2), bind(&Framework::OnCountryFileDelete, this, _1, _2)); + m_storage.SetDownloadingPolicy(&m_storageDownloadingPolicy); m_storage.SetStartDownloadingCallback([this]() { UpdatePlacePageInfoForCurrentSelection(); }); LOG(LDEBUG, ("Storage initialized")); @@ -1943,13 +1943,13 @@ BookmarkManager const & Framework::GetBookmarkManager() const return *m_bmManager.get(); } -void Framework::SetPlacePageListeners(PlacePageEvent::OnOpen const & onOpen, - PlacePageEvent::OnClose const & onClose, - PlacePageEvent::OnUpdate const & onUpdate) +void Framework::SetPlacePageListeners(PlacePageEvent::OnOpen onOpen, + PlacePageEvent::OnClose onClose, + PlacePageEvent::OnUpdate onUpdate) { - m_onPlacePageOpen = onOpen; - m_onPlacePageClose = onClose; - m_onPlacePageUpdate = onUpdate; + m_onPlacePageOpen = std::move(onOpen); + m_onPlacePageClose = std::move(onClose); + m_onPlacePageUpdate = std::move(onUpdate); } place_page::Info const & Framework::GetCurrentPlacePageInfo() const diff --git a/map/framework.hpp b/map/framework.hpp index c7de352efd..3d52081994 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -343,9 +343,9 @@ public: using OnUpdate = std::function; }; - void SetPlacePageListeners(PlacePageEvent::OnOpen const & onOpen, - PlacePageEvent::OnClose const & onClose, - PlacePageEvent::OnUpdate const & onUpdate); + void SetPlacePageListeners(PlacePageEvent::OnOpen onOpen, + PlacePageEvent::OnClose onClose, + PlacePageEvent::OnUpdate onUpdate); bool HasPlacePageInfo() const { return m_currentPlacePageInfo.has_value(); } place_page::Info const & GetCurrentPlacePageInfo() const; place_page::Info & GetCurrentPlacePageInfo(); diff --git a/platform/background_downloader_ios.h b/platform/background_downloader_ios.h index e29bdee1a2..1f381a324d 100644 --- a/platform/background_downloader_ios.h +++ b/platform/background_downloader_ios.h @@ -2,13 +2,6 @@ NS_ASSUME_NONNULL_BEGIN -@protocol BackgroundDownloaderSubscriber - -- (void)didStartDownloading; -- (void)didFinishDownloading; - -@end - typedef void (^DownloadCompleteBlock)(NSError *_Nullable error); typedef void (^DownloadProgressBlock)(int64_t bytesWritten, int64_t bytesExpected); @@ -19,9 +12,6 @@ typedef void (^DownloadProgressBlock)(int64_t bytesWritten, int64_t bytesExpecte + (BackgroundDownloader *)sharedBackgroundMapDownloader; -- (void)subscribe:(id)subscriber; -- (void)unsubscribe:(id)subscriber; - - (NSUInteger)downloadWithUrl:(NSURL *)url completion:(DownloadCompleteBlock)completion progress:(DownloadProgressBlock)progress; diff --git a/platform/background_downloader_ios.mm b/platform/background_downloader_ios.mm index cdc08be0fa..494475c9ca 100644 --- a/platform/background_downloader_ios.mm +++ b/platform/background_downloader_ios.mm @@ -51,7 +51,6 @@ @property(nonatomic, strong) NSURLSession *session; @property(nonatomic, strong) NSMutableDictionary *tasks; @property(nonatomic, strong) NSMutableDictionary *restoredTasks; -@property(nonatomic, strong) NSHashTable *subscribers; @property(nonatomic, strong) MapFileSaveStrategy *saveStrategy; @end @@ -78,7 +77,6 @@ [configuration setSessionSendsLaunchEvents:YES]; _session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil]; _tasks = [NSMutableDictionary dictionary]; - _subscribers = [NSHashTable weakObjectsHashTable]; _saveStrategy = saveStrategy; _restoredTasks = [NSMutableDictionary dictionary]; @@ -118,14 +116,6 @@ return self; } -- (void)subscribe:(id)subscriber { - [self.subscribers addObject:subscriber]; -} - -- (void)unsubscribe:(id)subscriber { - [self.subscribers removeObject:subscriber]; -} - - (NSUInteger)downloadWithUrl:(NSURL *)url completion:(DownloadCompleteBlock)completion progress:(DownloadProgressBlock)progress { @@ -144,11 +134,6 @@ taskIdentifier = task.taskIdentifier; } - if ([self.tasks count] == 1) { - for (id subscriber in self.subscribers) - [subscriber didStartDownloading]; - } - return taskIdentifier; } @@ -168,11 +153,6 @@ } } } - - if (needNotify && [self.tasks count] == 0) { - for (id subscriber in self.subscribers) - [subscriber didFinishDownloading]; - } } - (void)clear { @@ -187,11 +167,6 @@ [self.tasks removeAllObjects]; [self.restoredTasks removeAllObjects]; - - if (needNotify) { - for (id subscriber in self.subscribers) - [subscriber didFinishDownloading]; - } } #pragma mark - NSURLSessionDownloadDelegate implementation @@ -206,11 +181,6 @@ info.completion(error); [self.tasks removeObjectForKey:@(downloadTask.taskIdentifier)]; - - if ([self.tasks count] == 0) { - for (id subscriber in self.subscribers) - [subscriber didFinishDownloading]; - } } - (void)URLSession:(NSURLSession *)session diff --git a/search/search_integration_tests/downloader_search_test.cpp b/search/search_integration_tests/downloader_search_test.cpp index c5de89c1ca..343713ff64 100644 --- a/search/search_integration_tests/downloader_search_test.cpp +++ b/search/search_integration_tests/downloader_search_test.cpp @@ -88,15 +88,14 @@ class TestMapFilesDownloader : public storage::MapFilesDownloader { public: // MapFilesDownloader overrides: - void Remove(storage::CountryId const & id) override {} + void Remove(storage::CountryId const &) override {} void Clear() override {} storage::QueueInterface const & GetQueue() const override { return m_queue; } private: - void GetServersList(ServersListCallback const & /* callback */) override {} - - void Download(storage::QueuedCountry & queuedCountry) override {} + void GetServersList(ServersListCallback const &) override {} + void Download(storage::QueuedCountry &&) override {} storage::Queue m_queue; }; diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 24443060e9..bc40791d9d 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -56,8 +56,6 @@ if (${PLATFORM_IPHONE}) SRC background_downloading/downloader_adapter_ios.h background_downloading/downloader_adapter_ios.mm - background_downloading/downloader_subscriber_adapter_ios.h - background_downloading/downloader_subscriber_adapter_ios.mm background_downloading/downloader_queue_ios.hpp background_downloading/downloader_queue_ios.cpp ) diff --git a/storage/background_downloading/downloader_adapter_ios.h b/storage/background_downloading/downloader_adapter_ios.h index 6a8e7a17e4..f0bc17c74b 100644 --- a/storage/background_downloading/downloader_adapter_ios.h +++ b/storage/background_downloading/downloader_adapter_ios.h @@ -1,7 +1,5 @@ #pragma once -#import "storage/background_downloading/downloader_subscriber_adapter_ios.h" - #include "storage/background_downloading/downloader_queue_ios.hpp" #include "storage/map_files_downloader_with_ping.hpp" @@ -10,8 +8,6 @@ namespace storage class BackgroundDownloaderAdapter : public MapFilesDownloaderWithPing { public: - BackgroundDownloaderAdapter(); - // MapFilesDownloader overrides: void Remove(CountryId const & countryId) override; @@ -21,13 +17,12 @@ public: private: // MapFilesDownloaderWithServerList overrides: - void Download(QueuedCountry & queuedCountry) override; + void Download(QueuedCountry && queuedCountry) override; // Trying to download mwm from different servers recursively. void DownloadFromAnyUrl(CountryId const & countryId, std::string const & downloadPath, std::vector const & urls); BackgroundDownloaderQueue m_queue; - SubscriberAdapter * m_subscriberAdapter; }; } // namespace storage diff --git a/storage/background_downloading/downloader_adapter_ios.mm b/storage/background_downloading/downloader_adapter_ios.mm index df20f03231..e1cc1460eb 100644 --- a/storage/background_downloading/downloader_adapter_ios.mm +++ b/storage/background_downloading/downloader_adapter_ios.mm @@ -27,12 +27,6 @@ namespace storage { -BackgroundDownloaderAdapter::BackgroundDownloaderAdapter() -{ - m_subscriberAdapter = [[SubscriberAdapter alloc] initWithSubscribers:m_subscribers]; - BackgroundDownloader * downloader = [BackgroundDownloader sharedBackgroundMapDownloader]; - [downloader subscribe:m_subscriberAdapter]; -} void BackgroundDownloaderAdapter::Remove(CountryId const & countryId) { @@ -55,7 +49,7 @@ void BackgroundDownloaderAdapter::Clear() BackgroundDownloader * downloader = [BackgroundDownloader sharedBackgroundMapDownloader]; [downloader clear]; m_queue.Clear(); -}; +} QueueInterface const & BackgroundDownloaderAdapter::GetQueue() const { @@ -65,25 +59,21 @@ QueueInterface const & BackgroundDownloaderAdapter::GetQueue() const return m_queue; } -void BackgroundDownloaderAdapter::Download(QueuedCountry & queuedCountry) +void BackgroundDownloaderAdapter::Download(QueuedCountry && queuedCountry) { if (!IsDownloadingAllowed()) { queuedCountry.OnDownloadFinished(downloader::DownloadStatus::Failed); - if (m_queue.IsEmpty()) - { - for (auto const & subscriber : m_subscribers) - subscriber->OnFinishDownloading(); - } return; } auto const countryId = queuedCountry.GetCountryId(); auto const urls = MakeUrlList(queuedCountry.GetRelativeUrl()); - + + auto const path = queuedCountry.GetFileDownloadPath(); m_queue.Append(std::move(queuedCountry)); - DownloadFromAnyUrl(countryId, queuedCountry.GetFileDownloadPath(), urls); + DownloadFromAnyUrl(countryId, path, urls); } void BackgroundDownloaderAdapter::DownloadFromAnyUrl(CountryId const & countryId, @@ -132,4 +122,5 @@ std::unique_ptr GetDownloader() { return std::make_unique(); } + } // namespace storage diff --git a/storage/background_downloading/downloader_subscriber_adapter_ios.h b/storage/background_downloading/downloader_subscriber_adapter_ios.h deleted file mode 100644 index feed6cfca7..0000000000 --- a/storage/background_downloading/downloader_subscriber_adapter_ios.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#import -#import "platform/background_downloader_ios.h" - -#include "storage/map_files_downloader.hpp" - -#include - -NS_ASSUME_NONNULL_BEGIN - -@interface SubscriberAdapter : NSObject - -- (instancetype)initWithSubscribers:(std::vector &)subscribers; - -- (void)didStartDownloading; -- (void)didFinishDownloading; - -@end - -NS_ASSUME_NONNULL_END diff --git a/storage/background_downloading/downloader_subscriber_adapter_ios.mm b/storage/background_downloading/downloader_subscriber_adapter_ios.mm deleted file mode 100644 index 46f1ee1391..0000000000 --- a/storage/background_downloading/downloader_subscriber_adapter_ios.mm +++ /dev/null @@ -1,36 +0,0 @@ -#import "storage/downloader_subscriber_adapter_ios.h" - -using namespace storage; - -@interface SubscriberAdapter() -{ - std::vector * m_subscribers; -} - -@end - -@implementation SubscriberAdapter - -- (instancetype)initWithSubscribers:(std::vector &)subscribers -{ - self = [super init]; - - if (self) - m_subscribers = &subscribers; - - return self; -} - -- (void)didStartDownloading -{ - for (auto const & subscriber : *m_subscribers) - subscriber->OnStartDownloading(); -} - -- (void)didFinishDownloading -{ - for (auto const & subscriber : *m_subscribers) - subscriber->OnFinishDownloading(); -} - -@end diff --git a/storage/http_map_files_downloader.cpp b/storage/http_map_files_downloader.cpp index 4cdf724b41..2de76cde46 100644 --- a/storage/http_map_files_downloader.cpp +++ b/storage/http_map_files_downloader.cpp @@ -38,19 +38,15 @@ HttpMapFilesDownloader::~HttpMapFilesDownloader() CHECK_THREAD_CHECKER(m_checker, ()); } -void HttpMapFilesDownloader::Download(QueuedCountry & queuedCountry) +void HttpMapFilesDownloader::Download(QueuedCountry && queuedCountry) { CHECK_THREAD_CHECKER(m_checker, ()); m_queue.Append(std::move(queuedCountry)); - if (m_queue.Count() != 1) - return; - - for (auto const subscriber : m_subscribers) - subscriber->OnStartDownloading(); - - Download(); + /// @todo Remain old behaviour, but why == 1? + if (m_queue.Count() == 1) + Download(); } void HttpMapFilesDownloader::Download() @@ -96,15 +92,8 @@ void HttpMapFilesDownloader::Remove(CountryId const & id) m_queue.Remove(id); - if (m_queue.IsEmpty()) - { - for (auto const subscriber : m_subscribers) - subscriber->OnFinishDownloading(); - } - else if (!m_request) - { + if (!m_queue.IsEmpty() && !m_request) Download(); - } } void HttpMapFilesDownloader::Clear() @@ -113,16 +102,8 @@ void HttpMapFilesDownloader::Clear() MapFilesDownloader::Clear(); - auto needNotify = m_request != nullptr; - m_request.reset(); m_queue.Clear(); - - if (needNotify) - { - for (auto const subscriber : m_subscribers) - subscriber->OnFinishDownloading(); - } } QueueInterface const & HttpMapFilesDownloader::GetQueue() const @@ -151,14 +132,7 @@ void HttpMapFilesDownloader::OnMapFileDownloaded(QueuedCountry const & queuedCou m_request.reset(); if (!m_queue.IsEmpty()) - { Download(); - } - else - { - for (auto const subscriber : m_subscribers) - subscriber->OnFinishDownloading(); - } } void HttpMapFilesDownloader::OnMapFileDownloadingProgress(QueuedCountry const & queuedCountry, diff --git a/storage/http_map_files_downloader.hpp b/storage/http_map_files_downloader.hpp index 1260add852..a57c7a10fd 100644 --- a/storage/http_map_files_downloader.hpp +++ b/storage/http_map_files_downloader.hpp @@ -30,7 +30,7 @@ public: private: // MapFilesDownloaderWithServerList overrides: - void Download(QueuedCountry & queuedCountry) override; + void Download(QueuedCountry && queuedCountry) override; void Download(); diff --git a/storage/map_files_downloader.cpp b/storage/map_files_downloader.cpp index 8e1ae8e9d1..3053dbdb11 100644 --- a/storage/map_files_downloader.cpp +++ b/storage/map_files_downloader.cpp @@ -14,12 +14,11 @@ namespace storage { - -void MapFilesDownloader::DownloadMapFile(QueuedCountry & queuedCountry) +void MapFilesDownloader::DownloadMapFile(QueuedCountry && queuedCountry) { if (!m_serversList.empty()) { - Download(queuedCountry); + Download(std::move(queuedCountry)); return; } @@ -31,7 +30,7 @@ void MapFilesDownloader::DownloadMapFile(QueuedCountry & queuedCountry) { m_pendingRequests.ForEachCountry([this](QueuedCountry & country) { - Download(country); + Download(std::move(country)); }); m_pendingRequests.Clear(); @@ -73,16 +72,6 @@ QueueInterface const & MapFilesDownloader::GetQueue() const return m_pendingRequests; } -void MapFilesDownloader::Subscribe(Subscriber * subscriber) -{ - m_subscribers.push_back(subscriber); -} - -void MapFilesDownloader::UnsubscribeAll() -{ - m_subscribers.clear(); -} - // static std::string MapFilesDownloader::MakeFullUrlLegacy(std::string const & baseUrl, std::string const & fileName, int64_t dataVersion) { diff --git a/storage/map_files_downloader.hpp b/storage/map_files_downloader.hpp index fc2e0ca09a..568fa3c524 100644 --- a/storage/map_files_downloader.hpp +++ b/storage/map_files_downloader.hpp @@ -24,24 +24,14 @@ class MapFilesDownloader public: // Denotes bytes downloaded and total number of bytes. using ServersList = std::vector; - using ServersListCallback = platform::SafeCallback; - class Subscriber - { - public: - virtual ~Subscriber() = default; - - virtual void OnStartDownloading() = 0; - virtual void OnFinishDownloading() = 0; - }; - virtual ~MapFilesDownloader() = default; /// Asynchronously downloads a map file, periodically invokes /// onProgress callback and finally invokes onDownloaded /// callback. Both callbacks will be invoked on the main thread. - void DownloadMapFile(QueuedCountry & queuedCountry); + void DownloadMapFile(QueuedCountry && queuedCountry); // Removes item from m_quarantine queue when list of servers is not received. // Parent method must be called into override method. @@ -55,9 +45,6 @@ public: // Parent method must be called into override method. virtual QueueInterface const & GetQueue() const; - void Subscribe(Subscriber * subscriber); - void UnsubscribeAll(); - static std::string MakeFullUrlLegacy(std::string const & baseUrl, std::string const & fileName, int64_t dataVersion); /** @@ -79,8 +66,6 @@ protected: // Synchronously loads list of servers by http client. static ServersList LoadServersList(); - std::vector m_subscribers; - private: /** * @brief This method is blocking and should be called on network thread. @@ -89,7 +74,7 @@ private: */ virtual void GetServersList(ServersListCallback const & callback); /// Asynchronously downloads the file and saves result to provided directory. - virtual void Download(QueuedCountry & queuedCountry) = 0; + virtual void Download(QueuedCountry && queuedCountry) = 0; /// @param[in] callback Called in main thread (@see GetServersList). void RunServersListAsync(std::function && callback); diff --git a/storage/storage.cpp b/storage/storage.cpp index 0ac0bb2b7c..16e250bb31 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -131,7 +131,6 @@ Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */, , m_dataDir(dataDir) { m_downloader->SetDownloadingPolicy(m_downloadingPolicy); - m_downloader->Subscribe(this); SetLocale(languages::GetCurrentTwine()); LoadCountriesFile(pathToCountriesFile); @@ -143,7 +142,6 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting, : m_downloader(move(mapDownloaderForTesting)) { m_downloader->SetDownloadingPolicy(m_downloadingPolicy); - m_downloader->Subscribe(this); m_currentVersion = LoadCountriesFromBuffer(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations, @@ -152,12 +150,12 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting, CalcMaxMwmSizeBytes(); } -void Storage::Init(UpdateCallback const & didDownload, DeleteCallback const & willDelete) +void Storage::Init(UpdateCallback didDownload, DeleteCallback willDelete) { CHECK_THREAD_CHECKER(m_threadChecker, ()); - m_didDownload = didDownload; - m_willDelete = willDelete; + m_didDownload = std::move(didDownload); + m_willDelete = std::move(willDelete); } void Storage::SetDownloadingPolicy(DownloadingPolicy * policy) @@ -494,7 +492,7 @@ void Storage::DownloadCountry(CountryId const & countryId, MapFileType type) m_diffsDataSource); queuedCountry.Subscribe(*this); - m_downloader->DownloadMapFile(queuedCountry); + m_downloader->DownloadMapFile(std::move(queuedCountry)); } void Storage::DeleteCountry(CountryId const & countryId, MapFileType type) @@ -564,13 +562,6 @@ bool Storage::IsDownloadInProgress() const return !m_downloader->GetQueue().IsEmpty(); } -Storage::DownloadingCountries const & Storage::GetCurrentDownloadingCountries() const -{ - CHECK_THREAD_CHECKER(m_threadChecker, ()); - - return m_downloadingCountries; -} - void Storage::LoadCountriesFile(string const & pathToCountriesFile) { if (m_countries.IsEmpty()) @@ -647,7 +638,11 @@ void Storage::OnStartDownloading(QueuedCountry const & queuedCountry) { CHECK_THREAD_CHECKER(m_threadChecker, ()); + if (m_startDownloadingCallback) + m_startDownloadingCallback(); + m_downloadingCountries[queuedCountry.GetCountryId()] = Progress::Unknown(); + NotifyStatusChangedForHierarchy(queuedCountry.GetCountryId()); } @@ -670,6 +665,8 @@ void Storage::OnDownloadFinished(QueuedCountry const & queuedCountry, DownloadSt m_downloadingCountries.erase(queuedCountry.GetCountryId()); OnMapDownloadFinished(queuedCountry.GetCountryId(), status, queuedCountry.GetFileType()); + + OnFinishDownloading(); } void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapFileType type) @@ -803,18 +800,12 @@ bool Storage::IsDiffApplyingInProgressToCountry(CountryId const & countryId) con return m_diffsBeingApplied.find(countryId) != m_diffsBeingApplied.cend(); } -void Storage::SetLocale(string const & locale) { m_countryNameGetter.SetLocale(locale); } -string Storage::GetLocale() const { return m_countryNameGetter.GetLocale(); } void Storage::SetDownloaderForTesting(unique_ptr downloader) { if (m_downloader) - { - m_downloader->UnsubscribeAll(); m_downloader->Clear(); - } m_downloader = move(downloader); - m_downloader->Subscribe(this); m_downloader->SetDownloadingPolicy(m_downloadingPolicy); } @@ -1261,8 +1252,7 @@ void Storage::LoadDiffScheme() { CHECK_THREAD_CHECKER(m_threadChecker, ()); diffs::LocalMapsInfo localMapsInfo; - auto const currentVersion = GetCurrentDataVersion(); - localMapsInfo.m_currentDataVersion = currentVersion; + localMapsInfo.m_currentDataVersion = m_currentVersion; CountriesVec localMaps; GetLocalRealMaps(localMaps); @@ -1270,7 +1260,9 @@ void Storage::LoadDiffScheme() { auto const localFile = GetLatestLocalFile(countryId); auto const mapVersion = localFile->GetVersion(); - if (mapVersion != currentVersion && mapVersion > 0) + + // mapVersion > m_currentVersion if newer mwm folder was downloaded manually + if (mapVersion < m_currentVersion && mapVersion > 0) localMapsInfo.m_localMaps.emplace(localFile->GetCountryName(), mapVersion); } @@ -1355,8 +1347,7 @@ void Storage::ApplyDiff(CountryId const & countryId, functionGetQueue().IsEmpty()) - OnFinishDownloading(); + OnFinishDownloading(); }); } @@ -1412,17 +1403,9 @@ void Storage::SetStartDownloadingCallback(StartDownloadingCallback const & cb) m_startDownloadingCallback = cb; } -void Storage::OnStartDownloading() -{ - if (m_startDownloadingCallback) - m_startDownloadingCallback(); -} - void Storage::OnFinishDownloading() { - // When downloading is finished but diffs applying in progress - // it will be called from ApplyDiff callback. - if (!m_diffsBeingApplied.empty()) + if (!m_diffsBeingApplied.empty() || !m_downloader->GetQueue().IsEmpty()) return; m_justDownloaded.clear(); @@ -1685,11 +1668,8 @@ void Storage::CancelDownloadNode(CountryId const & countryId) if (setQueue.count(descendantId) != 0) needNotify = DeleteCountryFilesFromDownloader(descendantId); - if (m_failedCountries.count(descendantId) != 0) - { - m_failedCountries.erase(descendantId); + if (m_failedCountries.erase(descendantId) != 0) needNotify = true; - } m_downloadingCountries.erase(countryId); diff --git a/storage/storage.hpp b/storage/storage.hpp index fc6d7624e4..7153ab51d1 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -146,12 +146,10 @@ struct NodeStatuses // Downloading of only one mwm at a time is supported, so while the // mwm at the top of the queue is being downloaded (or updated by // applying a diff file) all other mwms have to wait. -class Storage : public MapFilesDownloader::Subscriber, - public QueuedCountry::Subscriber +class Storage final : public QueuedCountry::Subscriber { public: using StartDownloadingCallback = std::function; - using FinishDownloadingCallback = std::function; using UpdateCallback = std::function; using DeleteCallback = std::function; using ChangeCountryFunction = std::function; @@ -300,7 +298,7 @@ public: Storage(std::string const & referenceCountriesTxtJsonForTesting, std::unique_ptr mapDownloaderForTesting); - void Init(UpdateCallback const & didDownload, DeleteCallback const & willDelete); + void Init(UpdateCallback didDownload, DeleteCallback willDelete); void SetDownloadingPolicy(DownloadingPolicy * policy); @@ -531,16 +529,14 @@ public: /// Notifies observers about country status change. void DeleteCustomCountryVersion(platform::LocalCountryFile const & localFile); - DownloadingCountries const & GetCurrentDownloadingCountries() const; - bool IsDownloadInProgress() const; /// @param[out] res Populated with oudated countries. void GetOutdatedCountries(std::vector & countries) const; /// Sets and gets locale, which is used to get localized counries names - void SetLocale(std::string const & locale); - std::string GetLocale() const; + void SetLocale(std::string const & locale) { m_countryNameGetter.SetLocale(locale); } + std::string GetLocale() const { return m_countryNameGetter.GetLocale(); } MwmSize GetMaxMwmSizeBytes() const { return m_maxMwmSizeBytes; } @@ -557,9 +553,8 @@ public: void SetStartDownloadingCallback(StartDownloadingCallback const & cb); - // MapFilesDownloader::Subscriber overrides: - void OnStartDownloading() override; - void OnFinishDownloading() override; +protected: + void OnFinishDownloading(); private: friend struct UnitClass_StorageTest_DeleteCountry; diff --git a/storage/storage_tests/fake_map_files_downloader.cpp b/storage/storage_tests/fake_map_files_downloader.cpp index 8162c506bf..2d129d77f3 100644 --- a/storage/storage_tests/fake_map_files_downloader.cpp +++ b/storage/storage_tests/fake_map_files_downloader.cpp @@ -21,19 +21,14 @@ FakeMapFilesDownloader::FakeMapFilesDownloader(TaskRunner & taskRunner) FakeMapFilesDownloader::~FakeMapFilesDownloader() { CHECK_THREAD_CHECKER(m_checker, ()); } -void FakeMapFilesDownloader::Download(QueuedCountry & queuedCountry) +void FakeMapFilesDownloader::Download(QueuedCountry && queuedCountry) { CHECK_THREAD_CHECKER(m_checker, ()); m_queue.Append(std::move(queuedCountry)); - if (m_queue.Count() != 1) - return; - - for (auto const subscriber : m_subscribers) - subscriber->OnStartDownloading(); - - Download(); + if (m_queue.Count() == 1) + Download(); } void FakeMapFilesDownloader::Remove(CountryId const & id) @@ -130,13 +125,6 @@ void FakeMapFilesDownloader::OnFileDownloaded(QueuedCountry const & queuedCountr m_taskRunner.PostTask([country, status]() { country.OnDownloadFinished(status); }); if (!m_queue.IsEmpty()) - { Download(); - } - else - { - for (auto const subscriber : m_subscribers) - subscriber->OnFinishDownloading(); - } } } // namespace storage diff --git a/storage/storage_tests/fake_map_files_downloader.hpp b/storage/storage_tests/fake_map_files_downloader.hpp index 8ce8818ca9..423f850abd 100644 --- a/storage/storage_tests/fake_map_files_downloader.hpp +++ b/storage/storage_tests/fake_map_files_downloader.hpp @@ -41,7 +41,7 @@ public: private: // MapFilesDownloader overrides: - void Download(QueuedCountry & queuedCountry) override; + void Download(QueuedCountry && queuedCountry) override; void Download(); void DownloadNextChunk(uint64_t requestId); diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 02daba509d..3f31484724 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -39,11 +39,9 @@ 3DFACF40243C985A00A29A94 /* downloader_queue_universal.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFACF3C243C985A00A29A94 /* downloader_queue_universal.hpp */; }; 3DFACF41243C985A00A29A94 /* downloader_queue_universal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFACF3D243C985A00A29A94 /* downloader_queue_universal.cpp */; }; 3DFACF42243C985A00A29A94 /* downloader_queue.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFACF3E243C985A00A29A94 /* downloader_queue.hpp */; }; - 3DFACF4D243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DFACF45243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.h */; }; 3DFACF4E243CB1AB00A29A94 /* downloader_queue_ios.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFACF46243CB1AB00A29A94 /* downloader_queue_ios.hpp */; }; 3DFACF4F243CB1AB00A29A94 /* downloader_adapter_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DFACF47243CB1AB00A29A94 /* downloader_adapter_ios.h */; }; 3DFACF51243CB1AB00A29A94 /* downloader_adapter_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DFACF49243CB1AB00A29A94 /* downloader_adapter_ios.mm */; }; - 3DFACF52243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DFACF4A243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.mm */; }; 3DFACF53243CB1AB00A29A94 /* downloader_queue_ios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFACF4B243CB1AB00A29A94 /* downloader_queue_ios.cpp */; }; 401ECED41F56C50900DFDF76 /* country_parent_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401ECED21F56C50900DFDF76 /* country_parent_getter.cpp */; }; 401ECED51F56C50900DFDF76 /* country_parent_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401ECED31F56C50900DFDF76 /* country_parent_getter.hpp */; }; @@ -257,11 +255,9 @@ 3DFACF3C243C985A00A29A94 /* downloader_queue_universal.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloader_queue_universal.hpp; sourceTree = ""; }; 3DFACF3D243C985A00A29A94 /* downloader_queue_universal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloader_queue_universal.cpp; sourceTree = ""; }; 3DFACF3E243C985A00A29A94 /* downloader_queue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloader_queue.hpp; sourceTree = ""; }; - 3DFACF45243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = downloader_subscriber_adapter_ios.h; sourceTree = ""; }; 3DFACF46243CB1AB00A29A94 /* downloader_queue_ios.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloader_queue_ios.hpp; sourceTree = ""; }; 3DFACF47243CB1AB00A29A94 /* downloader_adapter_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = downloader_adapter_ios.h; sourceTree = ""; }; 3DFACF49243CB1AB00A29A94 /* downloader_adapter_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = downloader_adapter_ios.mm; sourceTree = ""; }; - 3DFACF4A243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = downloader_subscriber_adapter_ios.mm; sourceTree = ""; }; 3DFACF4B243CB1AB00A29A94 /* downloader_queue_ios.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloader_queue_ios.cpp; sourceTree = ""; }; 401ECED21F56C50900DFDF76 /* country_parent_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_parent_getter.cpp; sourceTree = ""; }; 401ECED31F56C50900DFDF76 /* country_parent_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_parent_getter.hpp; sourceTree = ""; }; @@ -520,11 +516,9 @@ 3DFACF43243CB1AB00A29A94 /* background_downloading */ = { isa = PBXGroup; children = ( - 3DFACF45243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.h */, 3DFACF46243CB1AB00A29A94 /* downloader_queue_ios.hpp */, 3DFACF47243CB1AB00A29A94 /* downloader_adapter_ios.h */, 3DFACF49243CB1AB00A29A94 /* downloader_adapter_ios.mm */, - 3DFACF4A243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.mm */, 3DFACF4B243CB1AB00A29A94 /* downloader_queue_ios.cpp */, ); path = background_downloading; @@ -743,7 +737,6 @@ 402873442295A91F0036AA1C /* downloader_search_params.hpp in Headers */, 6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */, 67247FD61C60BA8A00EDE56A /* test_map_files_downloader.hpp in Headers */, - 3DFACF4D243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.h in Headers */, 34B093231C61F9BA0066F4C3 /* storage_helpers.hpp in Headers */, 402873422295A91F0036AA1C /* country_tree.hpp in Headers */, ); @@ -913,7 +906,6 @@ 34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */, 675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */, 3DCD414720D80C0900143533 /* country_info_reader_light.cpp in Sources */, - 3DFACF52243CB1AB00A29A94 /* downloader_subscriber_adapter_ios.mm in Sources */, 56DAC38523992819000BC50D /* queued_country.cpp in Sources */, 6753431A1A3F5A2600A0A8C3 /* storage.cpp in Sources */, 674125231B4C05FA00A3E828 /* storage_defines.cpp in Sources */,