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

[ads] promo banners are not removable by "Remove Ads" subscription now.

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-05-15 17:20:27 +03:00 • committed by Daria Volvenkova
parent c9390d8321
commit d7691a1bd5
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
partners_api/ads/ads_engine.cpp
View file

@ -58,8 +58,8 @@ Engine::Engine(std::unique_ptr<Delegate> delegate)
m_downloadOnMapBanners.emplace_back(Banner::Type::TinkoffInsurance,
std::make_unique<TinkoffInsurance>(*m_delegate));
m_downloadOnMapBanners.emplace_back(Banner::Type::Skyeng, std::make_unique<Skyeng>(*m_delegate));
m_downloadOnMapBanners.emplace_back(Banner::Type::BookmarkCatalog,
std::make_unique<BookmarkCatalog>(*m_delegate));
m_downloadOnMapPromo.emplace_back(Banner::Type::BookmarkCatalog,
std::make_unique<BookmarkCatalog>(*m_delegate));
}
std::vector<Banner> Engine::GetPoiBanners(feature::TypesHolder const & types,
@ -78,8 +78,17 @@ std::vector<Banner> Engine::GetDownloadOnMapBanners(storage::CountryId const & d
m2::PointD const & userPos,
std::string const & userLanguage) const
{
return GetBanners(m_downloadOnMapBanners, m_delegate->IsAdsRemoved(), downloadMwmId, userPos,
userLanguage);
auto result = GetBanners(m_downloadOnMapBanners, m_delegate->IsAdsRemoved(), downloadMwmId,
userPos, userLanguage);
// Promo banners are not removable by "Remove Ads" subscription.
auto promo = GetBanners(m_downloadOnMapPromo, false /* isAdsRemoved */, downloadMwmId, userPos,
userLanguage);
for (auto & promoItem : promo)
{
result.emplace_back(std::move(promoItem));
}
return result;
}
void Engine::DisableAdProvider(Banner::Type const type, Banner::Place const place)

1
partners_api/ads/ads_engine.hpp
View file

@ -67,5 +67,6 @@ private:
std::vector<ContainerItem<PoiContainerBase>> m_poiBanners;
std::vector<ContainerItem<SearchContainerBase>> m_searchBanners;
std::vector<ContainerItem<DownloadOnMapContainer>> m_downloadOnMapBanners;
std::vector<ContainerItem<DownloadOnMapContainer>> m_downloadOnMapPromo;
};
} // namespace ads