Allow user to override automatic idle timer toggling

ole · ole · commit 55a82fda1bb7 · 2013-02-06T15:32:36.000+01:00
diff --git a/Classes/DocSetDownloadManager.h b/Classes/DocSetDownloadManager.h
@@ -28,13 +28,16 @@
 	
 	NSDate *_lastUpdated;
 	BOOL _updatingAvailableDocSetsFromWeb;
+    
+    BOOL _neverDisableIdleTimer;
 }
 
 @property (nonatomic, strong) NSArray *downloadedDocSets;
 @property (nonatomic, strong) NSSet *downloadedDocSetNames;
 @property (nonatomic, strong) NSArray *availableDownloads;
 @property (nonatomic, strong) DocSetDownload *currentDownload;
 @property (nonatomic, strong) NSDate *lastUpdated;
+@property (nonatomic, assign) BOOL neverDisableIdleTimer;
 
 + (id)sharedDownloadManager;
 - (void)reloadAvailableDocSets;
diff --git a/Classes/DocSetDownloadManager.m b/Classes/DocSetDownloadManager.m
@@ -23,7 +23,7 @@ - (void)downloadFailed:(DocSetDownload *)download;
 
 @implementation DocSetDownloadManager
 
-@synthesize downloadedDocSets=_downloadedDocSets, downloadedDocSetNames=_downloadedDocSetNames, availableDownloads=_availableDownloads, currentDownload=_currentDownload, lastUpdated=_lastUpdated;
+@synthesize downloadedDocSets=_downloadedDocSets, downloadedDocSetNames=_downloadedDocSetNames, availableDownloads=_availableDownloads, currentDownload=_currentDownload, lastUpdated=_lastUpdated, neverDisableIdleTimer = _neverDisableIdleTimer;
 
 - (id)init
 {
@@ -221,14 +221,20 @@ - (void)downloadFailed:(DocSetDownload *)download
 - (void)toggleIdleTimerIfNeeded
 {
     BOOL shouldDisableIdleTimer = NO;
-    if (self.currentDownload) {
+    if (self.currentDownload && !self.neverDisableIdleTimer) {
         shouldDisableIdleTimer = YES;
     }
     
     [[UIApplication sharedApplication] setIdleTimerDisabled:shouldDisableIdleTimer];
     [[NSNotificationCenter defaultCenter] postNotificationName:DocSetDownloadManagerIdleTimerToggledNotification object:self];
 }
 
+- (void)setNeverDisableIdleTimer:(BOOL)neverDisableIdleTimer
+{
+    _neverDisableIdleTimer = neverDisableIdleTimer;
+    [self toggleIdleTimerIfNeeded];
+}
+
 @end
 
 
diff --git a/Classes/DownloadViewController.m b/Classes/DownloadViewController.m
@@ -96,6 +96,7 @@ - (void)done:(id)sender
 
 - (void)disableIdleTimerSwitchToggled:(id)sender
 {
+    [[DocSetDownloadManager sharedDownloadManager] setNeverDisableIdleTimer:!self.disableIdleTimerSwitch.on];
 }
 
 - (void)idleTimerToggled:(NSNotification *)notification

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ - (void)downloadFailed:(DocSetDownload *)download;`
`23`	`23`
`24`	`24`	`@implementation DocSetDownloadManager`
`25`	`25`
`26`		`-@synthesize downloadedDocSets=_downloadedDocSets, downloadedDocSetNames=_downloadedDocSetNames, availableDownloads=_availableDownloads, currentDownload=_currentDownload, lastUpdated=_lastUpdated;`
	`26`	`+@synthesize downloadedDocSets=_downloadedDocSets, downloadedDocSetNames=_downloadedDocSetNames, availableDownloads=_availableDownloads, currentDownload=_currentDownload, lastUpdated=_lastUpdated, neverDisableIdleTimer = _neverDisableIdleTimer;`
`27`	`27`
`28`	`28`	`- (id)init`
`29`	`29`	`{`
`@@ -221,14 +221,20 @@ - (void)downloadFailed:(DocSetDownload *)download`
`221`	`221`	`- (void)toggleIdleTimerIfNeeded`
`222`	`222`	`{`
`223`	`223`	`BOOL shouldDisableIdleTimer = NO;`
`224`		`- if (self.currentDownload) {`
	`224`	`+ if (self.currentDownload && !self.neverDisableIdleTimer) {`
`225`	`225`	`shouldDisableIdleTimer = YES;`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`[[UIApplication sharedApplication] setIdleTimerDisabled:shouldDisableIdleTimer];`
`229`	`229`	`[[NSNotificationCenter defaultCenter] postNotificationName:DocSetDownloadManagerIdleTimerToggledNotification object:self];`
`230`	`230`	`}`
`231`	`231`
	`232`	`+- (void)setNeverDisableIdleTimer:(BOOL)neverDisableIdleTimer`
	`233`	`+{`
	`234`	`+ _neverDisableIdleTimer = neverDisableIdleTimer;`
	`235`	`+ [self toggleIdleTimerIfNeeded];`
	`236`	`+}`
	`237`	`+`
`232`	`238`	`@end`
`233`	`239`
`234`	`240`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ - (void)done:(id)sender`
`96`	`96`
`97`	`97`	`- (void)disableIdleTimerSwitchToggled:(id)sender`
`98`	`98`	`{`
	`99`	`+ [[DocSetDownloadManager sharedDownloadManager] setNeverDisableIdleTimer:!self.disableIdleTimerSwitch.on];`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`- (void)idleTimerToggled:(NSNotification *)notification`