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

[android] Fixed show banner redundant event

Browse source
This commit is contained in:
Dmitry Donskoy 2020-04-07 16:16:20 +03:00 • committed by Vladimir Byko-Ianko
parent de6432bef0
commit 353685701f
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
{
updateStateInternal(shouldAutoDownload);
if (mPromoBanner == null || mCurrentCountry == null)
if (mPromoBanner == null || !hasMapDownloading(mCurrentCountry))
return;
Statistics.ParameterBuilder builder =
@ -116,6 +116,16 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_BANNER_SHOW, builder);
}
private static boolean hasMapDownloading(@Nullable CountryItem country)
{
if (country == null) return false;
boolean enqueued = country.status == CountryItem.STATUS_ENQUEUED;
boolean progress = country.status == CountryItem.STATUS_PROGRESS;
boolean applying = country.status == CountryItem.STATUS_APPLYING;
return enqueued || progress || applying;
}
private void updateProgressState(boolean shouldAutoDownload)
{
updateStateInternal(shouldAutoDownload);
@ -293,11 +303,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
mPromoBanner = Framework.nativeGetDownloaderPromoBanner(mCurrentCountry.id);
boolean isPromoFound = mPromoBanner != null;
boolean enqueued = mCurrentCountry.status == CountryItem.STATUS_ENQUEUED;
boolean progress = mCurrentCountry.status == CountryItem.STATUS_PROGRESS;
boolean applying = mCurrentCountry.status == CountryItem.STATUS_APPLYING;
boolean isDownloading = enqueued || progress || applying;
boolean isDownloading = hasMapDownloading(mCurrentCountry);
if (!isDownloading || !isPromoFound)
{