mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-20 05:14:44 +00:00
Cleaning up a bit.
This commit is contained in:
parent
59bf1577bf
commit
73a6e74b6d
1 changed files with 148 additions and 151 deletions
|
@ -422,11 +422,10 @@
|
|||
|
||||
- (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback {
|
||||
NSString *theFeedDetailURL;
|
||||
NSLog(@"Fetch Feed in view: %@ (%@)", self, storiesCollection);
|
||||
|
||||
if (!storiesCollection.activeFeed) return;
|
||||
|
||||
if (callback || (!self.pageFetching && !self.pageFinished)) {
|
||||
if (!callback && (self.pageFetching || self.pageFinished)) return;
|
||||
|
||||
self.feedPage = page;
|
||||
self.pageFetching = YES;
|
||||
|
@ -500,7 +499,6 @@
|
|||
[request setTag:[[[storiesCollection activeFeed] objectForKey:@"id"] intValue]];
|
||||
[request startAsynchronous];
|
||||
[requests addObject:request];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)loadOfflineStories {
|
||||
|
@ -602,8 +600,8 @@
|
|||
#pragma mark River of News
|
||||
|
||||
- (void)fetchRiverPage:(int)page withCallback:(void(^)())callback {
|
||||
NSLog(@"Fetch River in view: %@ (%@)", self, storiesCollection);
|
||||
if (!self.pageFetching && !self.pageFinished) {
|
||||
if (self.pageFetching || self.pageFinished) return;
|
||||
|
||||
self.feedPage = page;
|
||||
self.pageFetching = YES;
|
||||
NSInteger storyCount = storiesCollection.storyCount;
|
||||
|
@ -689,7 +687,6 @@
|
|||
}];
|
||||
[request setTimeOutSeconds:30];
|
||||
[request startAsynchronous];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
|
Loading…
Add table
Reference in a new issue