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

Megafon only for russians

Browse source
This commit is contained in:
r.kuznetsov 2018-06-21 11:04:19 +03:00 • committed by Arsentiy Milchakov
parent be33f936d2
commit 8b03f2d8de
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1636,7 +1636,8 @@ Java_com_mapswithme_maps_Framework_nativeHasMegafonDownloaderBanner(JNIEnv * env
jstring mwmId)
{
return static_cast<jboolean>(ads::HasMegafonDownloaderBanner(frm()->GetStorage(),
jni::ToNativeString(env, mwmId)));
jni::ToNativeString(env, mwmId),
languages::GetCurrentNorm()));
}
JNIEXPORT jstring JNICALL

6
partners_api/megafon_countries.cpp
View file

@ -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)

3
partners_api/megafon_countries.hpp
View file

@ -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

6
partners_api/partners_api_tests/megafon_countries_tests.cpp
View file

@ -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"), ());
}