From efe9fa1c924da146d4ff53122ca1e3463c1180bf Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Mon, 25 Apr 2016 15:59:28 +0300 Subject: [PATCH] [ios] Fixed search from downloader with no downloaded maps. --- .../MWMBaseMapDownloaderViewController.mm | 2 ++ .../MapDownloader/MWMMapDownloaderViewController.mm | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm index b5e2fb2dd6..11fda99b46 100644 --- a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm +++ b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm @@ -263,6 +263,8 @@ using namespace mwm; - (void)configAllMapsView { + if (self.dataSource != self.defaultDataSource) + return; auto const & s = GetFramework().Storage(); TCountryId const parentCountryId = self.parentCountryId.UTF8String; if (self.mode == DownloaderMode::Downloaded) diff --git a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm index 60996cce55..93284a9392 100644 --- a/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm +++ b/iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm @@ -91,7 +91,8 @@ using namespace storage; auto const & s = GetFramework().Storage(); if (![self.parentCountryId isEqualToString:@(s.GetRootId().c_str())]) return; - if (self.mode == mwm::DownloaderMode::Available || s.HaveDownloadedCountries()) + if (self.mode == mwm::DownloaderMode::Available || s.HaveDownloadedCountries() || + self.dataSource == self.searchDataSource) { [self configAllMapsView]; self.tableView.hidden = NO; @@ -210,4 +211,12 @@ using namespace storage; mode:mode]; } +#pragma mark - Helpers + +- (void)reloadTable +{ + [super reloadTable]; + [self checkAndConfigNoMapsView]; +} + @end