Fixed Android build

2 files changed, 11 insertions, 4 deletions

diff --git a/storage/storage.cpp b/storage/storage.cpp
index 7badee1d5f..b49c606a72 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -938,17 +938,22 @@ void Storage::OnMapDownloadFinished(TCountryId const & countryId, bool success,
 string Storage::GetFileDownloadUrl(string const & baseUrl,
                                    QueuedCountry const & queuedCountry) const
 {
-  auto const & countryId = queuedCountry.GetCountryId();
+  return GetFileDownloadUrl(baseUrl, queuedCountry.GetCountryId(),
+                            queuedCountry.GetCurrentFileOptions());
+}
+
+string Storage::GetFileDownloadUrl(string const & baseUrl, TCountryId const & countryId,
+                                   MapOptions options) const
+{
   CountryFile const & countryFile = GetCountryFile(countryId);
 
-  auto const currentFileOpt = queuedCountry.GetCurrentFileOptions();
   string const fileName =
-      GetFileName(countryFile.GetName(), currentFileOpt, GetCurrentDataVersion());
+    GetFileName(countryFile.GetName(), options, GetCurrentDataVersion());
 
   ostringstream url;
   url << baseUrl;
   string const currentVersion = strings::to_string(GetCurrentDataVersion());
-  if (currentFileOpt == MapOptions::Diff)
+  if (options == MapOptions::Diff)
     url << "diffs/" << currentVersion << "/"  << strings::to_string(m_diffManager.InfoFor(countryId).m_version);
   else
     url << OMIM_OS_NAME "/" << currentVersion;
diff --git a/storage/storage.hpp b/storage/storage.hpp
index 54d5539e7e..e16b0e8571 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -536,6 +536,8 @@ public:
   void EnableKeepDownloadingQueue(bool enable) {m_keepDownloadingQueue = enable;}
   /// get download url by base url & queued country
   string GetFileDownloadUrl(string const & baseUrl, QueuedCountry const & queuedCountry) const;
+  string GetFileDownloadUrl(string const & baseUrl, TCountryId const & countryId,
+                            MapOptions options) const;
 
   /// @param[out] res Populated with oudated countries.
   void GetOutdatedCountries(vector<Country const *> & countries) const;