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

[android] Added jni call, fixed https://github.com/yoksnod/omim/pull/5#discussion_r220502861, fixed review notes https://github.com/yoksnod/omim/pull/5#discussion_r220474557

Browse source
This commit is contained in:
Dmitry Donskoy 2018-09-26 13:36:00 +03:00 • committed by Aleksandr Zatsepin
parent 55b9ffe8d9
commit 18a8fa453e
5 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1135,9 +1135,10 @@ Java_com_mapswithme_maps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jcl
return result;
}
JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeDisableAdProvider(JNIEnv * env,
jclass, jint type,
jint place)
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeDisableAdProvider(JNIEnv *env,
jclass, jint type,
jint place)
{
auto const & bannerType = static_cast<ads::Banner::Type>(type);
auto const & bannerPlace = static_cast<ads::Banner::Place>(place);

2
android/src/com/mapswithme/maps/Framework.java
View file

@ -224,7 +224,7 @@ public class Framework
return FilterUtils.RATING_ANY;
}
public static void setAdProviderDisabled(@NonNull Banner.Type type)
public static void disableAdProvider(@NonNull Banner.Type type)
{
nativeDisableAdProvider(type.ordinal(), Banner.Place.DEFAULT.ordinal());
}

7
android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
View file

@ -182,6 +182,13 @@ public class ExternalLibrariesMediator
super.onPostExecute(status);
if (status != null && status)
onEnabled();
else
onDisabled();
}
private void onDisabled()
{
Framework.disableAdProvider(Banner.Type.TYPE_RB);
}
private void onEnabled()

2
map/framework.hpp
View file

@ -57,6 +57,7 @@
#include "partners_api/locals_api.hpp"
#include "partners_api/taxi_engine.hpp"
#include "partners_api/viator_api.hpp"
#include "partners_api/banner.hpp"
#include "metrics/eye_info.hpp"
@ -86,7 +87,6 @@
#include "std/vector.hpp"
#include <boost/optional.hpp>
#include "partners_api/banner.hpp"
namespace osm
{

26
partners_api/ads_engine.cpp
View file

@ -44,17 +44,17 @@ std::vector<Banner> Engine::GetBanners(feature::TypesHolder const & types,
for (auto const & item : m_banners)
{
if (item.m_enabled)
if (!item.m_enabled)
continue;
for (auto const & countryId : countryIds)
{
for (auto const & countryId : countryIds)
auto const bannerId = item.m_container->GetBannerId(types, countryId, userLanguage);
// We need to add banner for every banner system just once.
if (!bannerId.empty())
{
auto const bannerId = item.m_container->GetBannerId(types, countryId, userLanguage);
// We need to add banner for every banner system just once.
if (!bannerId.empty())
{
result.emplace_back(item.m_type, bannerId);
break;
}
result.emplace_back(item.m_type, bannerId);
break;
}
}
}
@ -93,18 +93,16 @@ void Engine::DisableAdProvider(Banner::Type const type, Banner::Place const plac
SetAdProviderEnabled(place == Banner::Place::Search ? m_searchBanners : m_banners, type, false);
}
void Engine::EnableAdProvider(Banner::Type const type, Banner::Place place)
{
SetAdProviderEnabled(place == Banner::Place::Search ? m_searchBanners : m_banners, type, true);
}
void Engine::SetAdProviderEnabled(std::vector<Engine::ContainerItem> & banners,
Banner::Type const type, bool const isEnabled)
{
for (auto & item : banners)
{
if (item.m_type == type)
{
item.m_enabled = isEnabled;
return;
}
}
}
} // namespace ads