From 4c70b50a3b2f9c77e0b245c8d68f510519bc1ab9 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Wed, 26 Sep 2018 18:14:55 +0300
Subject: [PATCH] [android] Fixed disable ad provider call

---
 android/jni/com/mapswithme/maps/Framework.cpp       | 8 ++++++--
 android/jni/com/mapswithme/maps/Framework.hpp       | 2 +-
 android/src/com/mapswithme/maps/MwmApplication.java | 2 +-
 map/framework.cpp                                   | 2 +-
 map/framework.hpp                                   | 2 +-
 partners_api/ads_engine.hpp                         | 1 -
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 8684eb549a..1af68d62e6 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -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
diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index bd26106d10..6caa141cdf 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -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);
diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index b491e1628f..99a4e372a8 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -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()
diff --git a/map/framework.cpp b/map/framework.cpp
index 68642a1b97..2a39e29012 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -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);
diff --git a/map/framework.hpp b/map/framework.hpp
index 0fb5c7f1f4..44b28e56c1 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -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:
diff --git a/partners_api/ads_engine.hpp b/partners_api/ads_engine.hpp
index 0f7f3f4623..cc4aa9d746 100644
--- a/partners_api/ads_engine.hpp
+++ b/partners_api/ads_engine.hpp
@@ -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;