From fdf50a3afd8e78cdd9dc4d08e180a3938e76d204 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Thu, 11 Jun 2020 18:53:17 +0300
Subject: [PATCH] [ios][editor] Remove conditions which can not be true.

---
 .../MWMEditorAdditionalNamesTableViewController.h    |  3 +--
 .../MWMEditorAdditionalNamesTableViewController.mm   | 12 ++----------
 iphone/Maps/UI/Editor/MWMEditorViewController.mm     |  3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h
index 36555eb44f..fd34e617a0 100644
--- a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h
+++ b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.h
@@ -12,7 +12,6 @@
 
 - (void)configWithDelegate:(id<MWMEditorAdditionalNamesProtocol>)delegate
                       name:(StringUtf8Multilang const &)name
-additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
-      selectedLanguageCode:(NSInteger)selectedLanguageCode;
+additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes;
 
 @end
diff --git a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
index 1d48118b50..77d48a0d56 100644
--- a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
+++ b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
@@ -3,7 +3,6 @@
 
 @interface MWMEditorAdditionalNamesTableViewController ()
 
-@property (nonatomic) NSInteger selectedLanguageCode;
 @property (weak, nonatomic) id<MWMEditorAdditionalNamesProtocol> delegate;
 
 @end
@@ -20,12 +19,10 @@
 - (void)configWithDelegate:(id<MWMEditorAdditionalNamesProtocol>)delegate
                       name:(StringUtf8Multilang const &)name
 additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
-      selectedLanguageCode:(NSInteger)selectedLanguageCode
 {
   self.delegate = delegate;
   m_name = name;
   m_additionalSkipLanguageCodes = additionalSkipLanguageCodes;
-  self.selectedLanguageCode = selectedLanguageCode;
 }
 
 - (void)viewDidLoad
@@ -40,17 +37,12 @@ additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
   auto const getIndex = [](std::string const & lang) { return StringUtf8Multilang::GetLangIndex(lang); };
   StringUtf8Multilang::Languages const & supportedLanguages = StringUtf8Multilang::GetSupportedLanguages();
   m_languages.clear();
-  if (self.selectedLanguageCode == StringUtf8Multilang::kDefaultCode ||
-      self.selectedLanguageCode == StringUtf8Multilang::kInternationalCode)
-  {
-    return;
-  }
 
   auto constexpr kDefaultCode = StringUtf8Multilang::kDefaultCode;
   for (auto const & language : supportedLanguages)
   {
     auto const langIndex = getIndex(language.m_code);
-    if (self.selectedLanguageCode == NSNotFound && langIndex != kDefaultCode && m_name.HasString(langIndex))
+    if (langIndex != kDefaultCode && m_name.HasString(langIndex))
       continue;
     auto it = std::find(m_additionalSkipLanguageCodes.begin(), m_additionalSkipLanguageCodes.end(), langIndex);
     if (it == m_additionalSkipLanguageCodes.end())
@@ -78,7 +70,7 @@ additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
   cell.detailTextLabel.text = @(language.m_code);
 
   int8_t const languageIndex = StringUtf8Multilang::GetLangIndex(language.m_code);
-  cell.accessoryType = (languageIndex == self.selectedLanguageCode ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone);
+  cell.accessoryType = UITableViewCellAccessoryNone;
   return cell;
 }
 
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 52c09647f7..a5fc050191 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -1067,8 +1067,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> const & cells, UIT
     MWMEditorAdditionalNamesTableViewController * dvc = segue.destinationViewController;
     [dvc configWithDelegate:self
                                name:m_mapObject.GetNameMultilang()
-        additionalSkipLanguageCodes:m_newAdditionalLanguages
-               selectedLanguageCode:((NSNumber *)sender).integerValue];
+        additionalSkipLanguageCodes:m_newAdditionalLanguages];
   }
 }