[android] Fix bug in startup screen. We can't call deleteCountry before Storage is initialized.

2 files changed, 8 insertions, 2 deletions

diff --git a/storage/storage.cpp b/storage/storage.cpp
index 5c9dbe9780..cf835ad1d2 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -242,7 +242,7 @@ namespace storage
     {
       m_workingDir = GetPlatform().WritableDir();
     }
-    /// @TODO do not delete other countries cells
+
     void operator()(CountryFile const & file)
     {
       FileWriter::DeleteFileX(m_workingDir + file.m_fileName + DOWNLOADING_FILE_EXTENSION);
@@ -266,6 +266,12 @@ namespace storage
     return country.Bounds();
   }
 
+  void Storage::DeleteCountryFiles(TIndex const & index)
+  {
+    Country const & country = CountryByIndex(index);
+    for_each(country.Files().begin(), country.Files().end(), DeleteMap());
+  }
+
   void Storage::DeleteCountry(TIndex const & index)
   {
     Country const & country = CountryByIndex(index);
diff --git a/storage/storage.hpp b/storage/storage.hpp
index 31e3ef33c7..4c25ffb41a 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -126,7 +126,6 @@ namespace storage
     //void GenerateSearchIndex(TIndex const & index, string const & fName);
     void UpdateAfterSearchIndex(TIndex const & index, string const & fName);
 
-    /// @TODO temporarily made public for Android, refactor
     void LoadCountriesFile(bool forceReload);
 
     void ReportProgress(TIndex const & index, pair<int64_t, int64_t> const & p);
@@ -165,6 +164,7 @@ namespace storage
 
     void DownloadCountry(TIndex const & index);
     void DeleteCountry(TIndex const & index);
+    void DeleteCountryFiles(TIndex const & index);
 
     void CheckForUpdate();