From 5cd63c6129347d42a32e05000b6abbdb38842642 Mon Sep 17 00:00:00 2001
From: Roman Kuznetsov <r.kuznetsow@gmail.com>
Date: Wed, 30 Jan 2019 14:32:31 +0300
Subject: [PATCH] [bookmarks] Fixed KMZ importing

---
 map/bookmark_manager.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 97d67b4bdd..ff7236d909 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -253,7 +253,7 @@ bool ConvertBookmarks(std::vector<std::string> const & files,
   convertedCount = 0;
 
   auto const conversionFolder = base::JoinPath(GetBackupFolderName(),
-                                             "conversion");
+                                               "conversion");
   if (!GetPlatform().IsFileExistsByFullPath(conversionFolder) &&
       !GetPlatform().MkDirChecked(conversionFolder))
   {
@@ -1093,11 +1093,11 @@ void BookmarkManager::LoadBookmarkRoutine(std::string const & filePath, bool isT
     {
       auto fileSavePath = savePath.get();
       auto kmlData = LoadKmlFile(fileSavePath, KmlFileType::Text);
-      if (kmlData && (::IsMyCategory(userId, kmlData->m_categoryData) || !FromCatalog(*kmlData)))
-      {
-        if (m_needTeardown)
-          return;
+      if (m_needTeardown)
+        return;
 
+      if (kmlData)
+      {
         if (migrated)
         {
           std::string fileName = base::GetNameFromFullPathWithoutExt(fileSavePath);
@@ -1967,10 +1967,6 @@ void BookmarkManager::ConvertAllKmlFiles(ConversionHandler && handler)
         continue;
       }
 
-      // Skip KML files from the catalog which are not belonged to the user.
-      if (FromCatalog(*kmlData) && !::IsMyCategory(userId, kmlData->m_categoryData))
-        continue;
-
       std::string fileName = base::GetNameFromFullPathWithoutExt(f);
       auto kmbPath = base::JoinPath(newDir, fileName + kKmbExtension);
       size_t counter = 1;