From fb2086bc084e10d4f7a0699483fe55be9ddbd32b Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 24 Mar 2016 21:48:18 +0300 Subject: [PATCH] [ios] Fixes by Vlad. --- .../Login/MWMAuthorizationLoginViewController.mm | 6 +----- .../Login/MWMAuthorizationOSMLoginViewController.mm | 2 +- .../Login/MWMAuthorizationWebViewLoginViewController.mm | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index 272f1dbf04..b3f2cdf61f 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -247,11 +247,7 @@ using namespace osm_auth_ios; - (IBAction)cancel { - UINavigationController * parentNavController = self.navigationController.navigationController; - if (parentNavController) - [parentNavController popViewControllerAnimated:YES]; - else - [self dismissViewControllerAnimated:YES completion:nil]; + [self.navigationController popViewControllerAnimated:YES]; } - (IBAction)localChangesAction diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm index ac7761e6d2..af03b28d37 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm @@ -145,7 +145,7 @@ using namespace osm; if (auth.IsAuthorized()) { osm_auth_ios::AuthorizationStoreCredentials(auth.GetKeySecret()); - [self dismissViewControllerAnimated:YES completion:nil]; + [self.navigationController popToRootViewControllerAnimated:YES]; } else { diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm index 2268eaa12f..1fdbfc4a9b 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm @@ -149,7 +149,7 @@ NSString * getVerifier(NSString * urlString) if (OsmOAuth::IsValid(ks)) { osm_auth_ios::AuthorizationStoreCredentials(ks); - [self dismissViewControllerAnimated:NO completion:nil]; + [self.navigationController popToRootViewControllerAnimated:YES]; } else {