From 18571c4c9615b36904cb77037e6caaf15278aaa8 Mon Sep 17 00:00:00 2001 From: Alexander Marchuk Date: Wed, 16 Mar 2016 14:10:15 +0300 Subject: [PATCH] [new downloader][android] fix: Onmap downloader fixes. --- android/jni/com/mapswithme/maps/MapManager.cpp | 2 +- .../src/com/mapswithme/maps/downloader/OnmapDownloader.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp index 1e2b4dda4e..6278103901 100644 --- a/android/jni/com/mapswithme/maps/MapManager.cpp +++ b/android/jni/com/mapswithme/maps/MapManager.cpp @@ -454,7 +454,7 @@ static void StatusChangedCallback(shared_ptr const & listenerRef, TCoun NodeStatuses ns; GetStorage().GetNodeStatuses(countryId, ns); - TBatchedData const data(countryId, ns.m_status, ns.m_error, ns.m_groupNode); + TBatchedData const data(countryId, ns.m_status, ns.m_error, !ns.m_groupNode); g_batchedCallbackData[*listenerRef].push_back(move(data)); if (!g_isBatched) diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java index f81ea7b9b4..9f1d623abe 100644 --- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java +++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java @@ -91,7 +91,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener if (showFrame) { boolean enqueued = (mCurrentCountry.status == CountryItem.STATUS_ENQUEUED); - boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS); + boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS && + !mCurrentCountry.present); boolean failed = (mCurrentCountry.status == CountryItem.STATUS_FAILED); showFrame = (enqueued || progress || failed ||