diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 95b816ccf3..9d8ccae894 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -51,6 +51,4 @@ - (id)featureHolder; -- (void)showAdditionalViewsIfNeeded; - @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index ac0c4aab6a..cf6f06999a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -351,23 +351,4 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; return self.placePageManager; } -- (void)showAdditionalViewsIfNeeded { - auto ownerController = self.ownerController; - - if ([MWMRouter isRoutingActive] || [MWMRouter hasSavedRoute]) - return; - - if (self.searchManager.state != MWMSearchManagerStateHidden) - return; - - if (self.menuState != MWMBottomMenuStateInactive) - return; - - if (ownerController.navigationController.viewControllers.count > 1) - return; - - if (DeepLinkHandler.shared.isLaunchedByDeeplink) - return; -} - @end diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index c4cbaddb67..621b4211a3 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -339,21 +339,12 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden) self.controlsManager.menuState = self.controlsManager.menuRestoreState; - [NSNotificationCenter.defaultCenter addObserver:self - selector:@selector(didBecomeActive) - name:UIApplicationDidBecomeActiveNotification - object:nil]; [self.welcomePageController show]; if (!self.welcomePageController) { [DeepLinkHandler.shared handleDeeplink]; } } -- (void)didBecomeActive { - if (!self.welcomePageController) - [self.controlsManager showAdditionalViewsIfNeeded]; -} - - (void)viewDidLayoutSubviews { [super viewDidLayoutSubviews]; if (!self.mapView.drapeEngineCreated) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index a14fe140e7..32c65e086a 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -61,13 +61,6 @@ void InitLocalizedStrings() { f.AddString("postal_code", L(@"postal_code").UTF8String); f.AddString("wifi", L(@"wifi").UTF8String); } - -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; @@ -126,7 +119,6 @@ using namespace osm_auth_ios; - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { NSLog(@"deeplinking: launchOptions %@", launchOptions); - OverrideUserAgent(); [HttpThreadImpl setDownloadIndicatorProtocol:self];