diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 30b0ea2d75..4d40f7deab 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -52,22 +52,25 @@ extern NSString * const MapsStatusChangedNotification = @"MapsStatusChangedNotification"; // Alert keys. -static NSString * const kUDLastLaunchDateKey = @"LastLaunchDate"; extern NSString * const kUDAlreadyRatedKey = @"UserAlreadyRatedApp"; -static NSString * const kUDSessionsCountKey = @"SessionsCount"; -static NSString * const kUDFirstVersionKey = @"FirstVersion"; -static NSString * const kUDLastRateRequestDate = @"LastRateRequestDate"; extern NSString * const kUDAlreadySharedKey = @"UserAlreadyShared"; -static NSString * const kUDLastShareRequstDate = @"LastShareRequestDate"; -static NSString * const kUDAutoNightModeOff = @"AutoNightModeOff"; -static NSString * const kIOSIDFA = @"IFA"; -static NSString * const kBundleVersion = @"BundleVersion"; extern NSString * const kUDTrackWarningAlertWasShown; extern string const kCountryCodeKey; extern string const kUniqueIdKey; extern string const kLanguageKey; +namespace +{ +NSString * const kUDLastLaunchDateKey = @"LastLaunchDate"; +NSString * const kUDSessionsCountKey = @"SessionsCount"; +NSString * const kUDFirstVersionKey = @"FirstVersion"; +NSString * const kUDLastRateRequestDate = @"LastRateRequestDate"; +NSString * const kUDLastShareRequstDate = @"LastShareRequestDate"; +NSString * const kUDAutoNightModeOff = @"AutoNightModeOff"; +NSString * const kIOSIDFA = @"IFA"; +NSString * const kBundleVersion = @"BundleVersion"; + /// Adds needed localized strings to C++ code /// @TODO Refactor localization mechanism to make it simpler void InitLocalizedStrings() @@ -127,6 +130,15 @@ void ConfigCrashTrackers() #endif } +void OverrideUserAgent() +{ + [[NSUserDefaults standardUserDefaults] registerDefaults:@{ + @"UserAgent" : @"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 " + @"(KHTML, like Gecko) Version/10.0 Mobile/14E269 Safari/602.1" + }]; +} +} // namespace + using namespace osm_auth_ios; @interface MapsAppDelegate () @@ -313,6 +325,8 @@ using namespace osm_auth_ios; - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + OverrideUserAgent(); + InitCrashTrackers(); // Initialize all 3party engines. diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 0f55f5f1f2..561e77c7b8 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -304,15 +304,14 @@ using TObservers = NSHashTable<__kindof TObserver>; auto const resultsCount = self->m_everywhereResults.GetCount(); auto const itemsIndex = [[MWMSearchIndex alloc] initWithSuggestionsCount:self.suggestionsCount resultsCount:resultsCount]; - auto bannersCache = [MWMBannersCache cache]; if (resultsCount > 0) { auto const & adsEngine = GetFramework().GetAdsEngine(); - if (adsEngine.HasSearchBanner()) + if (![MWMSettings adForbidden] && adsEngine.HasSearchBanner()) { self.banners = [[MWMSearchBanners alloc] initWithSearchIndex:itemsIndex]; __weak auto weakSelf = self; - [bannersCache + [[MWMBannersCache cache] getWithCoreBanners:banner_helpers::MatchPriorityBanners(adsEngine.GetSearchBanners()) cacheOnly:YES loadNew:reloadBanner