gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[new downloader][android] fix: Onmap downloader fixes.

Browse source
This commit is contained in:
Alexander Marchuk 2016-03-16 14:10:15 +03:00 • committed by Sergey Yershov
parent 2a43da3908
commit 18571c4c96
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/MapManager.cpp
View file

@ -454,7 +454,7 @@ static void StatusChangedCallback(shared_ptr<jobject> 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)

3
android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
View file

@ -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 ||