From 2e3a7709a05cad6991a62e891b45e7c22f249f5c Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Thu, 9 Jun 2016 16:31:21 +0300
Subject: [PATCH] [ios] Fixed map download dialog error handling.

---
 iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index 1b64f12bae..67c394c838 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -146,17 +146,14 @@ using namespace storage;
           m_autoDownloadCountryId = kInvalidCountryId;
           [self showDownloadRequest];
         }
-        [self addToSuperview];
         break;
       }
       case NodeStatus::Downloading:
         if (nodeAttrs.m_downloadingProgress.second != 0)
           [self showDownloading:static_cast<CGFloat>(nodeAttrs.m_downloadingProgress.first) / nodeAttrs.m_downloadingProgress.second];
-        [self addToSuperview];
         break;
       case NodeStatus::InQueue:
         [self showInQueue];
-        [self addToSuperview];
         break;
       case NodeStatus::Undefined:
       case NodeStatus::Error:
@@ -199,8 +196,11 @@ using namespace storage;
     return;
   self.nodeSize.textColor = [UIColor red];
   self.nodeSize.text = L(@"country_status_download_failed");
+  self.downloadButton.hidden = YES;
+  self.progressWrapper.hidden = NO;
   self.progress.state = MWMCircularProgressStateFailed;
   MWMAlertViewController * avc = self.controller.alertController;
+  [self addToSuperview];
   auto const retryBlock = ^
   {
     [Statistics logEvent:kStatDownloaderMapAction
@@ -210,6 +210,7 @@ using namespace storage;
             kStatFrom : kStatMap,
             kStatScenario : kStatDownload
           }];
+    [self showInQueue];
     [MWMStorage retryDownloadNode:self->m_countryId];
   };
   auto const cancelBlock = ^
@@ -237,6 +238,7 @@ using namespace storage;
 {
   self.downloadButton.hidden = NO;
   self.progressWrapper.hidden = YES;
+  [self addToSuperview];
 }
 
 - (void)showDownloading:(CGFloat)progress
@@ -246,6 +248,7 @@ using namespace storage;
   self.downloadButton.hidden = YES;
   self.progressWrapper.hidden = NO;
   self.progress.progress = progress;
+  [self addToSuperview];
 }
 
 - (void)showInQueue
@@ -255,6 +258,7 @@ using namespace storage;
   self.downloadButton.hidden = YES;
   self.progressWrapper.hidden = NO;
   self.progress.state = MWMCircularProgressStateSpinner;
+  [self addToSuperview];
 }
 
 - (void)processViewportCountryEvent:(TCountryId const &)countryId