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

[ios] Added switch to pending on first cold start.

Browse source 
If first position mode is NotFollowNoPosition, then switch to PendingPosition mode.
This commit is contained in:
Ilya Grechuhin 2016-04-29 16:32:27 +03:00 • committed by Alex Zolotarev
parent 81e981a15b
commit 4403d8fedf
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
iphone/Maps/Classes/MapViewController.mm
View file

@ -76,6 +76,9 @@ NSString * const kDownloaderSegue = @"Map2MapDownloaderSegue";
NSString * const kMigrationSegue = @"Map2MigrationSegue";
NSString * const kEditorSegue = @"Map2EditorSegue";
NSString * const kUDViralAlertWasShown = @"ViralAlertWasShown";
// The first launch after process started. Used to skip "Not follow, no position" state and to run locator.
BOOL gIsFirstMyPositionMode = YES;
} // namespace
@interface NSValueWrapper : NSObject
@ -572,23 +575,28 @@ NSString * const kUDViralAlertWasShown = @"ViralAlertWasShown";
[[MapsAppDelegate theApp].locationManager start:self];
break;
case location::NotFollowNoPosition:
{
self.disableStandbyOnLocationStateMode = NO;
BOOL const isLocationManagerStarted = [MapsAppDelegate theApp].locationManager.isStarted;
BOOL const isMapVisible = (self.navigationController.visibleViewController == self);
if (isLocationManagerStarted && isMapVisible && ![Alohalytics isFirstSession])
if (gIsFirstMyPositionMode && ![Alohalytics isFirstSession])
{
[self.alertController presentLocationNotFoundAlertWithOkBlock:^
GetFramework().SwitchMyPositionNextMode();
}
else
{
self.disableStandbyOnLocationStateMode = NO;
BOOL const isLocationManagerStarted = [MapsAppDelegate theApp].locationManager.isStarted;
BOOL const isMapVisible = (self.navigationController.visibleViewController == self);
if (isLocationManagerStarted && isMapVisible && ![Alohalytics isFirstSession])
{
GetFramework().SwitchMyPositionNextMode();
[self.alertController presentLocationNotFoundAlertWithOkBlock:^
{
GetFramework().SwitchMyPositionNextMode();
}
cancelBlock:^
{
[[MapsAppDelegate theApp].locationManager stop:self];
}];
}
cancelBlock:^
{
[[MapsAppDelegate theApp].locationManager stop:self];
}];
}
break;
}
case location::NotFollow:
self.disableStandbyOnLocationStateMode = NO;
break;
@ -597,6 +605,7 @@ NSString * const kUDViralAlertWasShown = @"ViralAlertWasShown";
self.disableStandbyOnLocationStateMode = YES;
break;
}
gIsFirstMyPositionMode = NO;
}
#pragma mark - MWMFrameworkRouteBuilderObserver