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

[android] Fixed disable ad provider call

Browse source
This commit is contained in:
Dmitry Donskoy 2018-09-26 18:14:55 +03:00 • committed by Aleksandr Zatsepin
parent 18a8fa453e
commit 4c70b50a3b
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -669,6 +669,10 @@ void Framework::LogLocalAdsEvent(local_ads::EventType type, double lat, double l
m_work.GetDrawScale(), local_ads::Clock::now(), lat, lon, accuracy);
m_work.GetLocalAdsManager().GetStatistics().RegisterEvent(std::move(event));
}
void Framework::DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place)
{
m_work.DisableAdProvider(type, place);
}
} // namespace android
//============ GLUE CODE for com.mapswithme.maps.Framework class =============//
@ -1136,13 +1140,13 @@ Java_com_mapswithme_maps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jcl
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeDisableAdProvider(JNIEnv *env,
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);
frm()->DisableAdProvider(bannerType, bannerPlace);
g_framework->DisableAdProvider(bannerType, bannerPlace);
}
JNIEXPORT jintArray JNICALL

2
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -197,7 +197,7 @@ namespace android
bool IsAutoRetryDownloadFailed();
bool IsDownloadOn3gEnabled();
void EnableDownloadOn3g();
void DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place);
uint64_t RequestTaxiProducts(JNIEnv * env, jobject policy, ms::LatLon const & from,
ms::LatLon const & to, taxi::SuccessCallback const & onSuccess,
taxi::ErrorCallback const & onError);

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

@ -135,7 +135,6 @@ public class MwmApplication extends Application
mMainLoopHandler = new Handler(getMainLooper());
mMediator = new ExternalLibrariesMediator(this);
mMediator.initSensitiveDataToleranceLibraries();
mMediator.initSensitiveDataStrictLibrariesAsync();
Statistics.INSTANCE.setMediator(mMediator);
mPrefs = getSharedPreferences(getString(R.string.pref_file_name), MODE_PRIVATE);
@ -240,6 +239,7 @@ public class MwmApplication extends Application
TrafficManager.INSTANCE.initialize();
SubwayManager.from(this).initialize();
mFrameworkInitialized = true;
mMediator.initSensitiveDataStrictLibrariesAsync();
}
private void initNativeStrings()

2
map/framework.cpp
View file

@ -3336,7 +3336,7 @@ ads::Engine const & Framework::GetAdsEngine() const
return *m_adsEngine;
}
void Framework::DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place)
void Framework::DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place) const
{
ASSERT(m_adsEngine, ());
m_adsEngine.get()->DisableAdProvider(type, place);

2
map/framework.hpp
View file

@ -352,7 +352,7 @@ public:
void VisualizeCityBoundariesInRect(m2::RectD const & rect);
ads::Engine const & GetAdsEngine() const;
void DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place);
void DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place) const;
public:
// SearchAPI::Delegate overrides:

1
partners_api/ads_engine.hpp
View file

@ -25,7 +25,6 @@ public:
std::vector<Banner> GetBanners(feature::TypesHolder const & types,
storage::TCountriesVec const & countryIds,
std::string const & userLanguage) const;
void EnableAdProvider(Banner::Type const type, Banner::Place bannerPlace);
void DisableAdProvider(Banner::Type const type, Banner::Place const place);
bool HasSearchBanner() const;
std::vector<Banner> GetSearchBanners() const;