diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index a1dcd02802..012fa28f8e 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -17,7 +17,6 @@ #include "partners_api/ads/banner.hpp" #include "partners_api/ads/mopub_ads.hpp" #include "partners_api/booking_block_params.hpp" -#include "partners_api/downloader_promo.hpp" #include "partners_api/megafon_countries.hpp" #include "web_api/utils.hpp" diff --git a/partners_api/CMakeLists.txt b/partners_api/CMakeLists.txt index 64ba373fc3..a6b9ffb621 100644 --- a/partners_api/CMakeLists.txt +++ b/partners_api/CMakeLists.txt @@ -36,8 +36,6 @@ set( booking_block_params.cpp booking_block_params.hpp booking_params_base.hpp - downloader_promo.cpp - downloader_promo.hpp freenow_api.cpp freenow_api.hpp locals_api.cpp diff --git a/partners_api/downloader_promo.cpp b/partners_api/downloader_promo.cpp deleted file mode 100644 index 8322616ba7..0000000000 --- a/partners_api/downloader_promo.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "partners_api/downloader_promo.hpp" - -#include "partners_api/megafon_countries.hpp" -#include "partners_api/promo_api.hpp" - -#include "storage/storage.hpp" - -#include "base/string_utils.hpp" - -namespace promo -{ -// static -DownloaderPromo::Banner DownloaderPromo::GetBanner(storage::Storage const & storage, - Api const & promoApi, std::string const & mwmId, - std::string const & currentLocale, - bool hasRemoveAdsSubscription) -{ - if (!hasRemoveAdsSubscription && ads::HasMegafonDownloaderBanner(storage, mwmId, currentLocale)) - return {Type::Megafon, ads::GetMegafonDownloaderBannerUrl()}; - - auto const & cities = storage.GetMwmTopCityGeoIds(); - auto const it = cities.find(mwmId); - - if (it != cities.cend()) - { - auto const id = strings::to_string(it->second.GetEncodedId()); - return {Type::BookmarkCatalog, promoApi.GetLinkForDownloader(id)}; - } - - return {}; -} -} // namespace promo diff --git a/partners_api/downloader_promo.hpp b/partners_api/downloader_promo.hpp deleted file mode 100644 index 7225decda7..0000000000 --- a/partners_api/downloader_promo.hpp +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include -#include - -namespace storage -{ -class Storage; -} - -namespace promo -{ -class Api; - -class DownloaderPromo -{ -public: - // Do not change the order. - enum class Type : uint8_t - { - NoPromo = 0, - BookmarkCatalog = 1, - Megafon = 2 - }; - - struct Banner - { - Banner() = default; - Banner(Type type, std::string const & url) - : m_type(type) - , m_url(url) - {} - - Type m_type = Type::NoPromo; - std::string m_url; - }; - - static Banner GetBanner(storage::Storage const & storage, Api const & promoApi, - std::string const & mwmId, std::string const & currentLocale, - bool hasRemoveAdsSubscription); -}; -} // namespace promo diff --git a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj index 1a8ca4e2d4..592480a9b0 100644 --- a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj +++ b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj @@ -89,8 +89,6 @@ 4566605320D920000085E8C1 /* megafon_countries_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4566605220D920000085E8C1 /* megafon_countries_tests.cpp */; }; 4566605520D920220085E8C1 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4566605420D920220085E8C1 /* libstorage.a */; }; 45AC338F22C4F449004DC574 /* utm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45AC338E22C4F448004DC574 /* utm.hpp */; }; - 45BABC33229812830060FA53 /* downloader_promo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45BABC31229812820060FA53 /* downloader_promo.cpp */; }; - 45BABC34229812830060FA53 /* downloader_promo.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45BABC32229812830060FA53 /* downloader_promo.hpp */; }; 45C380772094C5B400C18D81 /* partners.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45C380752094C5B400C18D81 /* partners.cpp */; }; 45C380782094C5B400C18D81 /* partners.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45C380762094C5B400C18D81 /* partners.hpp */; }; 56DAC37A2399261E000BC50D /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56DAC3792399261E000BC50D /* libsuccinct.a */; }; @@ -207,8 +205,6 @@ 4566605220D920000085E8C1 /* megafon_countries_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = megafon_countries_tests.cpp; sourceTree = ""; }; 4566605420D920220085E8C1 /* libstorage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstorage.a; sourceTree = BUILT_PRODUCTS_DIR; }; 45AC338E22C4F448004DC574 /* utm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utm.hpp; sourceTree = ""; }; - 45BABC31229812820060FA53 /* downloader_promo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloader_promo.cpp; sourceTree = ""; }; - 45BABC32229812830060FA53 /* downloader_promo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloader_promo.hpp; sourceTree = ""; }; 45C380752094C5B400C18D81 /* partners.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = partners.cpp; sourceTree = ""; }; 45C380762094C5B400C18D81 /* partners.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = partners.hpp; sourceTree = ""; }; 56DAC3792399261E000BC50D /* libsuccinct.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsuccinct.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -342,8 +338,6 @@ 3DCD415120DAB33700143533 /* booking_block_params.cpp */, 3DCD415220DAB33700143533 /* booking_block_params.hpp */, 3DA5713320B57358007BDE27 /* booking_params_base.hpp */, - 45BABC31229812820060FA53 /* downloader_promo.cpp */, - 45BABC32229812830060FA53 /* downloader_promo.hpp */, BB1956E41F543D7B003ECE6C /* locals_api.cpp */, BB1956E51F543D7C003ECE6C /* locals_api.hpp */, 349CFD09204571FF00569949 /* maxim_api.cpp */, @@ -468,7 +462,6 @@ 3DBD7C0D24251BF000ED9FE8 /* mts_ads.hpp in Headers */, 3D15ACE7214AA1B000F725D5 /* rutaxi_api.hpp in Headers */, 45C380782094C5B400C18D81 /* partners.hpp in Headers */, - 45BABC34229812830060FA53 /* downloader_promo.hpp in Headers */, 3DBD7B9924112DE100ED9FE8 /* freenow_api.hpp in Headers */, 3D15ACE6214AA1B000F725D5 /* taxi_delegate.hpp in Headers */, 3DFEBF9A1EFBFC1500317D5C /* taxi_base.hpp in Headers */, @@ -611,7 +604,6 @@ 3DBD7C0724251BF000ED9FE8 /* mts_ads.cpp in Sources */, F67E75251DB8F06F00D6741F /* opentable_api.cpp in Sources */, 3DBD7C1F24251C1100ED9FE8 /* mts_tests.cpp in Sources */, - 45BABC33229812830060FA53 /* downloader_promo.cpp in Sources */, 3D18DC4422956E0900A583A6 /* promo_tests.cpp in Sources */, 3DBD7C2324251C1100ED9FE8 /* tinkoff_airlines_tests.cpp in Sources */, BB1956E61F543D7C003ECE6C /* locals_api.cpp in Sources */,