public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly updating feed detail story title list on read. Also syncing all mark reads (including gestures).

Browse source
This commit is contained in:
Samuel Clay 2014-03-05 15:20:31 -08:00
parent 9254f799bb
commit efb9108a38
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/ios/Classes/FeedDetailViewController.m
View file

@ -172,8 +172,10 @@
[appDelegate.storyDetailViewController fetchTextView];
} else if (markUnread) {
[storiesCollection toggleStoryUnread:story];
[self reloadData];
} else if (saveStory) {
[storiesCollection toggleStorySaved:story];
[self reloadData];
}
inDoubleTap = NO;
}

8
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -1887,8 +1887,8 @@
for (StoryDetailViewController *page in @[storyPageControl.previousPage,
storyPageControl.currentPage,
storyPageControl.nextPage]) {
if (![[page.activeStory objectForKey:@"story_hash"]
isEqualToString:[story objectForKey:@"story_hash"]]) {
if ([[page.activeStory objectForKey:@"story_hash"]
isEqualToString:[story objectForKey:@"story_hash"]]) {
page.isRecentlyUnread = NO;
[storyPageControl refreshHeaders];
}
@ -1899,8 +1899,8 @@
for (StoryDetailViewController *page in @[storyPageControl.previousPage,
storyPageControl.currentPage,
storyPageControl.nextPage]) {
if (![[page.activeStory objectForKey:@"story_hash"]
isEqualToString:[story objectForKey:@"story_hash"]]) {
if ([[page.activeStory objectForKey:@"story_hash"]
isEqualToString:[story objectForKey:@"story_hash"]]) {
page.isRecentlyUnread = YES;
[storyPageControl refreshHeaders];
}

1
clients/ios/Classes/NewsBlurViewController.m
View file

@ -418,6 +418,7 @@ static UIFont *userLabelFont;
appDelegate.hasNoSites = NO;
appDelegate.recentlyReadStories = [NSMutableDictionary dictionary];
appDelegate.unreadStoryHashes = [NSMutableDictionary dictionary];
self.isOffline = NO;
NSString *responseString = [request responseString];

16
clients/ios/Classes/StoriesCollection.m
View file

@ -418,6 +418,11 @@
NSMutableDictionary *newStory = [story mutableCopy];
[newStory setValue:[NSNumber numberWithInt:1] forKey:@"read_status"];
if ([[appDelegate.activeStory objectForKey:@"story_hash"]
isEqualToString:[newStory objectForKey:@"story_hash"]]) {
appDelegate.activeStory = newStory;
}
// make the story as read in self.activeFeedStories
NSString *newStoryIdStr = [NSString stringWithFormat:@"%@", [newStory valueForKey:@"story_hash"]];
NSMutableArray *newActiveFeedStories = [self.activeFeedStories mutableCopy];
@ -430,10 +435,6 @@
}
}
self.activeFeedStories = newActiveFeedStories;
if ([[appDelegate.activeStory objectForKey:@"story_hash"]
isEqualToString:[newStory objectForKey:@"story_hash"]]) {
appDelegate.activeStory = newStory;
}
// If not a feed, then don't bother updating local feed.
if (!feed) return;
@ -508,6 +509,11 @@
NSMutableDictionary *newStory = [story mutableCopy];
[newStory setValue:[NSNumber numberWithInt:0] forKey:@"read_status"];
if ([[appDelegate.activeStory objectForKey:@"story_hash"]
isEqualToString:[newStory objectForKey:@"story_hash"]]) {
appDelegate.activeStory = newStory;
}
// make the story as read in self.activeFeedStories
NSString *newStoryIdStr = [NSString stringWithFormat:@"%@", [newStory valueForKey:@"story_hash"]];
NSMutableArray *newActiveFeedStories = [self.activeFeedStories mutableCopy];
@ -520,7 +526,7 @@
}
}
self.activeFeedStories = newActiveFeedStories;
// If not a feed, then don't bother updating local feed.
if (!feed) return;

2
clients/ios/Classes/StoryDetailViewController.m
View file

@ -137,8 +137,10 @@
[self fetchTextView];
} else if (markUnread) {
[appDelegate.storiesCollection toggleStoryUnread];
[appDelegate.feedDetailViewController reloadData];
} else if (saveStory) {
[appDelegate.storiesCollection toggleStorySaved];
[appDelegate.feedDetailViewController reloadData];
}
inDoubleTap = NO;
}