summaryrefslogtreecommitdiff
path: root/ios/app
diff options
context:
space:
mode:
authorJason Wray <jason@kulturny.com>2015-09-08 11:43:55 -0400
committerJason Wray <jason@kulturny.com>2015-09-08 11:43:55 -0400
commit9a55e9702915493ac34f58469674eaf9e77c019b (patch)
tree818f8b88cf3312f8eace0068824c5e43452e037a /ios/app
parent8f37502c719feb151e01cb31d89c2effaf1b91ad (diff)
downloadqtlocation-mapboxgl-9a55e9702915493ac34f58469674eaf9e77c019b.tar.gz
Fix build, only ask for location permission on user's instigation
Previously in #2265 we would ask for location permission at app startup if `!settings->showsUserLocation`. #2193 0a172a21fdc2a87473560fd7d45f4d495d95de91 changed the way we used `NSUserDefaults` and mostly removed the `settings` object, which broke #2265. Rather than fix our pestering location permissions ask at startup, this commit now only asks for location permissions when the user hits the locate-me button. Once a user grants permission, the user dot appears because a `userTrackingMode` is set, `showsUserLocation` is permanently set to `YES` in `NSUserDefaults` and is restored at launch.
Diffstat (limited to 'ios/app')
-rw-r--r--ios/app/MBXViewController.mm7
1 files changed, 0 insertions, 7 deletions
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index b323717702..d94e41b5f9 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -83,13 +83,6 @@ static NSUInteger const kStyleVersion = 8;
action:@selector(locateUser)];
[self restoreState:nil];
-
- if ( ! settings->showsUserLocation)
- {
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
- self.mapView.showsUserLocation = YES;
- });
- }
}
- (void)saveState:(__unused NSNotification *)notification