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

[ios] Fixed return to map after migration.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-09-23 16:40:12 +03:00 • committed by Vladimir Byko-Ianko
parent c84f3bed89
commit 26b2dc6750
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
View file

@ -12,6 +12,7 @@
#import "MWMMapDownloaderTableViewCell.h"
#import "MWMMapDownloaderViewController.h"
#import "MWMMyTarget.h"
#import "MWMMigrationViewController.h"
#import "MWMSegue.h"
#import "MWMStorage.h"
#import "MapsAppDelegate.h"
@ -164,14 +165,13 @@ using namespace mwm;
- (void)backTap
{
// TODO(igrechuhin): In case, when downloaded maps view controller appears after migration
// we have trouble with poping view controller. We expect to see map but as result
// we see migration controller.
// Poping to root controller seems to be helpful in this case, but probably not the best way to determine
// how far we should pop from this view controller.
if (self.dataSource.mode == mwm::DownloaderMode::Downloaded)
[self.navigationController popToRootViewControllerAnimated:YES];
UINavigationController * navVC = self.navigationController;
NSArray<UIViewController *> * viewControllers = navVC.viewControllers;
NSInteger const viewControllersCount = viewControllers.count;
NSInteger const prevVCIndex = viewControllersCount - 2;
Class const migrationClass = [MWMMigrationViewController class];
if (prevVCIndex < 0 || [viewControllers[prevVCIndex] isKindOfClass:migrationClass])
[navVC popToRootViewControllerAnimated:YES];
else
[super backTap];
}