[storage][platform] review fixes

android/src/com/mapswithme/maps/downloader/DownloaderActivity.java

@@ -12,7 +12,7 @@ public class DownloaderActivity extends BaseMwmFragmentActivity
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {
-    return (DownloaderFragment.class);
+    return DownloaderFragment.class;
   }
 
   @Override

android/src/com/mapswithme/maps/downloader/OnmapDownloader.java

@@ -144,7 +144,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
           }
           else
           {
-            sizeText = (StringUtils.getFileSizeString(mCurrentCountry.totalSize));
+            sizeText = StringUtils.getFileSizeString(mCurrentCountry.totalSize);
 
             if (shouldAutoDownload &&
                 Config.isAutodownloadEnabled() &&

android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java

@@ -167,7 +167,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
 
     Map<String, String> group = new HashMap<>();
     group.put(GROUP_NAME, getString(R.string.maps) + " (" + mMissingMaps.size() + ") ");
-    group.put(GROUP_SIZE, (StringUtils.getFileSizeString(size)));
+    group.put(GROUP_SIZE, StringUtils.getFileSizeString(size));
 
     List<Map<String, String>> groups = new ArrayList<>();
     groups.add(group);

map/framework.cpp

@@ -516,6 +516,11 @@ Framework::Framework(FrameworkParams const & params)
 
   m_promoApi->SetDelegate(make_unique<PromoDelegate>(m_featuresFetcher.GetDataSource(), *m_cityFinder));
   eye::Eye::Instance().Subscribe(m_promoApi.get());
+
+  // Clean the no longer used key from old devices.
+  // Remove this line after April 2020 (assuming the majority of devices
+  // will have updated by then).
+  GetPlatform().RunTask(Platform::Thread::Gui, [] { settings::Delete("LastMigration"); });
 }
 
 Framework::~Framework()

platform/local_country_file.hpp

@@ -40,9 +40,7 @@ public:
   // The directory must contain a full path to the country file.
   LocalCountryFile(std::string const & directory, CountryFile const & countryFile, int64_t version);
 
-  // Syncs internal state like availability of map and routing files,
-  // their sizes etc. with disk.
-  // In case of one component (single) mwm this method assumed the every mwm has a routing section.
+  // Syncs internal state like availability of files, their sizes etc. with disk.
   // Generality speaking it's not always true. To know it for sure it's necessary to read a mwm in
   // this method but it's not implemented by performance reasons. This check is done on
   // building routes stage.

platform/mwm_version.hpp

@@ -75,8 +75,8 @@ bool IsSingleMwm(int64_t version);
 /// Returns MwmType (SeparateMwms/SingleMwm/Unknown) on the basis of mwm version and format.
 MwmType GetMwmType(MwmVersion const & version);
 
-/// \brief This enum sets constants which are used for writing test to set a version of mwm
-/// which should be processed as either single or two components (mwm and routing) mwms.
+/// \brief This enum sets constants which are used for
+/// writing test to set a version of mwm which should be processed.
 enum ForTesting
 {
   FOR_TESTING_MWM1 = 991215,

platform/platform_tests/local_country_file_tests.cpp

@@ -121,6 +121,45 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
   }
 }
 
+UNIT_TEST(LocalCountryFile_CleanupMapFiles)
+{
+  Platform & platform = GetPlatform();
+  string const mapsDir = platform.WritableDir();
+
+  // Two fake directories for test country files and indexes.
+  ScopedDir dir3("3");
+  ScopedDir dir4("4");
+
+  ScopedDir absentCountryIndexesDir(dir4, "Absent");
+  ScopedDir irelandIndexesDir(dir4, "Ireland");
+
+  CountryFile irelandFile("Ireland");
+
+  LocalCountryFile irelandLocalFile(dir4.GetFullPath(), irelandFile, 4 /* version */);
+  ScopedFile irelandMapFile(dir4, irelandFile, MapFileType::Map);
+
+  // Check FindAllLocalMaps()
+  vector<LocalCountryFile> localFiles;
+  FindAllLocalMapsAndCleanup(4 /* latestVersion */, localFiles);
+  TEST(Contains(localFiles, irelandLocalFile), (irelandLocalFile, localFiles));
+
+  irelandLocalFile.SyncWithDisk();
+  TEST(irelandLocalFile.OnDisk(MapFileType::Map), ());
+  irelandLocalFile.DeleteFromDisk(MapFileType::Map);
+  TEST(!irelandMapFile.Exists(), (irelandMapFile));
+  irelandMapFile.Reset();
+
+  TEST(!dir3.Exists(), ("Empty directory", dir3, "wasn't removed."));
+  dir3.Reset();
+
+  TEST(dir4.Exists(), ());
+
+  TEST(!absentCountryIndexesDir.Exists(), ("Indexes for absent country weren't deleted."));
+  absentCountryIndexesDir.Reset();
+
+  TEST(irelandIndexesDir.Exists(), ());
+}
+
 UNIT_TEST(LocalCountryFile_CleanupPartiallyDownloadedFiles)
 {
   ScopedDir oldDir("101009");

storage/country_tree.cpp

@@ -326,7 +326,7 @@ CountryTree::Node const * const CountryTree::FindFirstLeaf(CountryId const & key
 }
 
 MwmSubtreeAttrs LoadGroupImpl(size_t depth, json_t * node, CountryId const & parent,
-                                        StoreInterface & store)
+                              StoreInterface & store)
 {
   CountryId id;
   FromJSONObject(node, "id", id);
@@ -336,7 +336,6 @@ MwmSubtreeAttrs LoadGroupImpl(size_t depth, json_t * node, CountryId const & par
   for (auto const & synonym : countryNameSynonyms)
     store.InsertCountryNameSynonym(id, synonym);
 
-  // Mapping affiliations to one component (small) mwms.
   vector<string> affiliations;
   FromJSONObjectOptionalField(node, "affiliations", affiliations);
   for (auto const & affilationValue : affiliations)