Cleaning up a bit.

This commit is contained in:
Samuel Clay 2014-02-12 20:46:59 -08:00
parent 59bf1577bf
commit 73a6e74b6d

View file

@ -422,11 +422,10 @@
- (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback { - (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback {
NSString *theFeedDetailURL; NSString *theFeedDetailURL;
NSLog(@"Fetch Feed in view: %@ (%@)", self, storiesCollection);
if (!storiesCollection.activeFeed) return; if (!storiesCollection.activeFeed) return;
if (callback || (!self.pageFetching && !self.pageFinished)) { if (!callback && (self.pageFetching || self.pageFinished)) return;
self.feedPage = page; self.feedPage = page;
self.pageFetching = YES; self.pageFetching = YES;
@ -500,7 +499,6 @@
[request setTag:[[[storiesCollection activeFeed] objectForKey:@"id"] intValue]]; [request setTag:[[[storiesCollection activeFeed] objectForKey:@"id"] intValue]];
[request startAsynchronous]; [request startAsynchronous];
[requests addObject:request]; [requests addObject:request];
}
} }
- (void)loadOfflineStories { - (void)loadOfflineStories {
@ -602,8 +600,8 @@
#pragma mark River of News #pragma mark River of News
- (void)fetchRiverPage:(int)page withCallback:(void(^)())callback { - (void)fetchRiverPage:(int)page withCallback:(void(^)())callback {
NSLog(@"Fetch River in view: %@ (%@)", self, storiesCollection); if (self.pageFetching || self.pageFinished) return;
if (!self.pageFetching && !self.pageFinished) {
self.feedPage = page; self.feedPage = page;
self.pageFetching = YES; self.pageFetching = YES;
NSInteger storyCount = storiesCollection.storyCount; NSInteger storyCount = storiesCollection.storyCount;
@ -689,7 +687,6 @@
}]; }];
[request setTimeOutSeconds:30]; [request setTimeOutSeconds:30];
[request startAsynchronous]; [request startAsynchronous];
}
} }
#pragma mark - #pragma mark -