Skip to content

Commit

Permalink
prevent display from sleeping when gogo tracker is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronpk committed Feb 2, 2019
1 parent 5fdc615 commit 05885b5
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
10 changes: 10 additions & 0 deletions GPSLogger/FirstViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,23 @@ - (void)viewWillAppear:(BOOL)animated {
} else {
self.tripDistanceUnitLabel.text = @"miles";
}

if([GLManager sharedManager].gogoTrackerEnabled == YES) {
[UIApplication sharedApplication].idleTimerDisabled = YES;
} else {
[UIApplication sharedApplication].idleTimerDisabled = NO;
}
}

- (void)viewDidDisappear:(BOOL)animated {
[self.viewRefreshTimer invalidate];
[[NSNotificationCenter defaultCenter] removeObserver:self];
}

- (void)viewWillDisappear:(BOOL)animated {
[UIApplication sharedApplication].idleTimerDisabled = NO;
}

- (void)viewWillUnload {
[self.viewRefreshTimer invalidate];
[[NSNotificationCenter defaultCenter] removeObserver:self];
Expand Down
2 changes: 1 addition & 1 deletion GPSLogger/GLManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ typedef enum {

@property (strong, nonatomic) NSNumber *sendingInterval;
@property BOOL pausesAutomatically;
@property BOOL gogoTracker;
@property BOOL gogoTrackerEnabled;
@property BOOL includeTrackingStats;
@property BOOL notificationsEnabled;
@property (nonatomic) CLLocationDistance resumesAfterDistance;
Expand Down
8 changes: 4 additions & 4 deletions GPSLogger/GLManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -688,14 +688,14 @@ - (void)setPausesAutomatically:(BOOL)pausesAutomatically {
self.locationManager.pausesLocationUpdatesAutomatically = pausesAutomatically;
}

- (BOOL)gogoTracker {
- (BOOL)gogoTrackerEnabled {
if([self defaultsKeyExists:GLEnableGogoTrackerDefaultsName]) {
return [[NSUserDefaults standardUserDefaults] boolForKey:GLEnableGogoTrackerDefaultsName];
} else {
return NO;
}
}
- (void)setGogoTracker:(BOOL)enabled {
- (void)setGogoTrackerEnabled:(BOOL)enabled {
[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:GLEnableGogoTrackerDefaultsName];
[[NSUserDefaults standardUserDefaults] synchronize];
if(enabled == NO) {
Expand Down Expand Up @@ -1246,7 +1246,7 @@ - (void)startFlightTrackerTimer {
- (void)retrieveCurrentFlightData {
// Check if the current wifi name matches a known flight provider
// if([@"gogoinflight" isEqualToString:[GLManager currentWifiHotSpotName]]) {
if(self.gogoTracker) {
if(self.gogoTrackerEnabled) {
// Make a request to the in-flight data URL
NSString *endpoint = @"http://airborne.gogoinflight.com/abp/ws/absServices/statusTray";
[_flightHTTPClient GET:endpoint parameters:NULL progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
Expand Down Expand Up @@ -1290,7 +1290,7 @@ - (void)retrieveCurrentFlightData {
NSLog(@"Error retrieving in-flight data");
// If there was a problem, disable tracking
// TODO: maybe do this after some amount of failures?
// self.gogoTracker = NO;
// self.gogoTrackerEnabled = NO;
[self _resetFlightTrackerAndStartAgain];
}];

Expand Down
4 changes: 2 additions & 2 deletions GPSLogger/SecondViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ - (void)viewWillAppear:(BOOL)animated {
self.pausesAutomatically.on = [GLManager sharedManager].pausesAutomatically;
self.includeTrackingStats.on = [GLManager sharedManager].includeTrackingStats;
self.enableNotifications.on = [GLManager sharedManager].notificationsEnabled;
self.enableGogoTracker.on = [GLManager sharedManager].gogoTracker;
self.enableGogoTracker.on = [GLManager sharedManager].gogoTrackerEnabled;

if([GLManager sharedManager].apiEndpointURL != nil) {
self.apiEndpointField.text = [GLManager sharedManager].apiEndpointURL;
Expand Down Expand Up @@ -241,7 +241,7 @@ - (IBAction)pointsPerBatchWasChanged:(UISegmentedControl *)sender {
}

- (IBAction)toggleGogoTracker:(UISwitch *)sender {
[GLManager sharedManager].gogoTracker = sender.on;
[GLManager sharedManager].gogoTrackerEnabled = sender.on;
}

- (IBAction)toggleTrackingStats:(UISwitch *)sender {
Expand Down

0 comments on commit 05885b5

Please sign in to comment.