Skip to content

Commit 50364fc

Browse files
committed
Update Reader hasMore API logic
1 parent 3205b65 commit 50364fc

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

WordPress/Classes/Services/Reader Post/ReaderPostService.m

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -768,13 +768,7 @@ - (void)mergePosts:(NSArray *)remotePosts
768768
[self deletePostsFromBlockedSitesInContext:context];
769769

770770
BOOL spaceAvailable = ([self numberOfPostsForTopic:readerTopic inContext:context] < [self maxPostsToSaveForTopic:readerTopic]);
771-
if ([ReaderHelpers isTopicTag:readerTopic] || [ReaderHelpers isRSSFeed:readerTopic]) {
772-
// For tags and RSS feeds, assume there is more content as long as more than zero results are returned.
773-
hasMore = (postsCount > 0 ) && spaceAvailable;
774-
} else {
775-
// For other topics, assume there is more content as long as the number of results requested is returned.
776-
hasMore = ([remotePosts count] == [self numberToSyncForTopic:readerTopic]) && spaceAvailable;
777-
}
771+
hasMore = postsCount > 0 && spaceAvailable;
778772
} completion:^{
779773
if (success) {
780774
success(postsCount, hasMore);
@@ -1151,16 +1145,8 @@ - (ReaderPost *)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost for
11511145
#pragma mark Internal
11521146

11531147
- (BOOL)canLoadMorePostsForTopic:(ReaderAbstractTopic * _Nonnull)readerTopic remotePosts:(NSArray * _Nonnull)remotePosts inContext: (NSManagedObjectContext * _Nonnull)context {
1154-
BOOL hasMore = NO;
11551148
BOOL spaceAvailable = ([self numberOfPostsForTopic:readerTopic inContext:context] < [self maxPostsToSaveForTopic:readerTopic]);
1156-
if ([ReaderHelpers isTopicTag:readerTopic] || [ReaderHelpers isRSSFeed:readerTopic]) {
1157-
// For tags and RSS feeds, assume there is more content as long as more than zero results are returned.
1158-
hasMore = ([remotePosts count] > 0 ) && spaceAvailable;
1159-
} else {
1160-
// For other topics, assume there is more content as long as the number of results requested is returned.
1161-
hasMore = ([remotePosts count] == [self numberToSyncForTopic:readerTopic]) && spaceAvailable;
1162-
}
1163-
return hasMore;
1149+
return [remotePosts count] > 0 && spaceAvailable;
11641150
}
11651151

11661152
@end

0 commit comments

Comments
 (0)