From 8b03f2d8de72f886be5e14face5caa95d0f12c2d Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 21 Jun 2018 11:04:19 +0300 Subject: [PATCH] Megafon only for russians --- android/jni/com/mapswithme/maps/Framework.cpp | 3 ++- partners_api/megafon_countries.cpp | 6 +++++- partners_api/megafon_countries.hpp | 3 ++- partners_api/partners_api_tests/megafon_countries_tests.cpp | 6 ++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 92232f2230..23f3b9b04a 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -1636,7 +1636,8 @@ Java_com_mapswithme_maps_Framework_nativeHasMegafonDownloaderBanner(JNIEnv * env jstring mwmId) { return static_cast(ads::HasMegafonDownloaderBanner(frm()->GetStorage(), - jni::ToNativeString(env, mwmId))); + jni::ToNativeString(env, mwmId), + languages::GetCurrentNorm())); } JNIEXPORT jstring JNICALL diff --git a/partners_api/megafon_countries.cpp b/partners_api/megafon_countries.cpp index 6f8940a61f..1be466f3d4 100644 --- a/partners_api/megafon_countries.cpp +++ b/partners_api/megafon_countries.cpp @@ -51,8 +51,12 @@ storage::TCountriesVec const kCountries = { }; } // namespace -bool HasMegafonDownloaderBanner(storage::Storage const & storage, std::string const & mwmId) +bool HasMegafonDownloaderBanner(storage::Storage const & storage, std::string const & mwmId, + std::string const & currentLocale) { + if (currentLocale.find("ru") == std::string::npos) + return false; + storage::TCountriesVec countries; storage.GetTopmostNodesFor(mwmId, countries); for (auto const & c : countries) diff --git a/partners_api/megafon_countries.hpp b/partners_api/megafon_countries.hpp index e95d76ed95..c1378f73a5 100644 --- a/partners_api/megafon_countries.hpp +++ b/partners_api/megafon_countries.hpp @@ -6,6 +6,7 @@ namespace ads { -extern bool HasMegafonDownloaderBanner(storage::Storage const & storage, std::string const & mwmId); +extern bool HasMegafonDownloaderBanner(storage::Storage const & storage, std::string const & mwmId, + std::string const & currentLocale); extern std::string GetMegafonDownloaderBannerUrl(); } // namespace ads diff --git a/partners_api/partners_api_tests/megafon_countries_tests.cpp b/partners_api/partners_api_tests/megafon_countries_tests.cpp index bb5f28e5f1..2ff23ea0fd 100644 --- a/partners_api/partners_api_tests/megafon_countries_tests.cpp +++ b/partners_api/partners_api_tests/megafon_countries_tests.cpp @@ -5,11 +5,13 @@ UNIT_TEST(MegafonCountriesTest_ExistedCountry) { storage::Storage storage; - TEST(ads::HasMegafonDownloaderBanner(storage, "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg"), ()); + TEST(ads::HasMegafonDownloaderBanner(storage, "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg", "ru"), ()); + + TEST(!ads::HasMegafonDownloaderBanner(storage, "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg", "en"), ()); } UNIT_TEST(MegafonCountriesTest_NotExistedCountry) { storage::Storage storage; - TEST(!ads::HasMegafonDownloaderBanner(storage, "Russia_Altai Krai"), ()); + TEST(!ads::HasMegafonDownloaderBanner(storage, "Russia_Altai Krai", "ru"), ()); }