mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Fixing first page on iphone issue. Also using reachability correctly to reload feed list when connected from offline.
This commit is contained in:
parent
5d0ed1dbc4
commit
46252225b8
5 changed files with 21 additions and 10 deletions
|
@ -118,6 +118,8 @@
|
|||
|
||||
self.notifier = [[NBNotifier alloc] initWithTitle:@"Fetching stories..." inView:self.view];
|
||||
[self.view addSubview:self.notifier];
|
||||
|
||||
storiesCollection = appDelegate.storiesCollection;
|
||||
}
|
||||
|
||||
- (void)preferredContentSizeChanged:(NSNotification *)aNotification {
|
||||
|
|
|
@ -120,8 +120,8 @@
|
|||
}
|
||||
|
||||
- (void) didChangedOrientation:(NSNotification *)sender {
|
||||
UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
|
||||
NSLog(@"Notifier changed orieintation to: %ld (%@/%@)", (long)orientation, NSStringFromCGRect(self.frame), NSStringFromCGRect(self.view.frame));
|
||||
// UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
|
||||
// NSLog(@"Notifier changed orieintation to: %ld (%@/%@)", (long)orientation, NSStringFromCGRect(self.frame), NSStringFromCGRect(self.view.frame));
|
||||
[self setView:self.view];
|
||||
self.progressBar.frame = CGRectMake(0, 4, 0, 1);
|
||||
}
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
#import "NBBarButtonItem.h"
|
||||
#import "TMCache.h"
|
||||
#import "StoriesCollection.h"
|
||||
#import "NSString+HTML.h"
|
||||
#import <float.h>
|
||||
|
||||
@implementation NewsBlurAppDelegate
|
||||
|
@ -433,7 +434,7 @@
|
|||
- (void)showSendTo:(UIViewController *)vc sender:(id)sender {
|
||||
NSString *authorName = [activeStory objectForKey:@"story_authors"];
|
||||
NSString *text = [activeStory objectForKey:@"story_content"];
|
||||
NSString *title = [activeStory objectForKey:@"story_title"];
|
||||
NSString *title = [[activeStory objectForKey:@"story_title"] stringByDecodingHTMLEntities];
|
||||
NSArray *images = [activeStory objectForKey:@"image_urls"];
|
||||
NSURL *url = [NSURL URLWithString:[activeStory objectForKey:@"story_permalink"]];
|
||||
NSString *feedId = [NSString stringWithFormat:@"%@", [activeStory objectForKey:@"story_feed_id"]];
|
||||
|
@ -818,6 +819,7 @@
|
|||
popoverHasFeedView = YES;
|
||||
|
||||
[feedDetailViewController resetFeedDetail];
|
||||
[feedDetailViewController view]; // Force viewDidLoad
|
||||
|
||||
if (transition) {
|
||||
UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc]
|
||||
|
@ -1033,7 +1035,14 @@
|
|||
- (void)loadRiverFeedDetailView:(FeedDetailViewController *)feedDetailView withFolder:(NSString *)folder {
|
||||
self.readStories = [NSMutableArray array];
|
||||
NSMutableArray *feeds = [NSMutableArray array];
|
||||
|
||||
[feedDetailView.storiesCollection setStories:nil];
|
||||
[feedDetailView.storiesCollection setFeedUserProfiles:nil];
|
||||
[feedDetailView view]; // force viewDidLoad
|
||||
self.inFeedDetail = YES;
|
||||
|
||||
[feedDetailView resetFeedDetail];
|
||||
|
||||
if ([folder isEqualToString:@"river_global"]) {
|
||||
feedDetailView.storiesCollection.isSocialRiverView = YES;
|
||||
feedDetailView.storiesCollection.isRiverView = YES;
|
||||
|
@ -1094,12 +1103,6 @@
|
|||
if (feedDetailView.storiesCollection.activeFolder) {
|
||||
[self.folderCountCache removeObjectForKey:feedDetailView.storiesCollection.activeFolder];
|
||||
}
|
||||
|
||||
[feedDetailView.storiesCollection setStories:nil];
|
||||
[feedDetailView.storiesCollection setFeedUserProfiles:nil];
|
||||
self.inFeedDetail = YES;
|
||||
|
||||
[feedDetailView resetFeedDetail];
|
||||
|
||||
[self flushQueuedReadStories:NO withCallback:^{
|
||||
[feedDetailView fetchRiver];
|
||||
|
|
|
@ -367,6 +367,8 @@ static UIFont *userLabelFont;
|
|||
[self informError:[request error]];
|
||||
self.inPullToRefresh_ = NO;
|
||||
|
||||
self.isOffline = YES;
|
||||
|
||||
[self showOfflineNotifier];
|
||||
}
|
||||
|
||||
|
@ -384,6 +386,7 @@ static UIFont *userLabelFont;
|
|||
[self informError:@"The server barfed!"];
|
||||
}
|
||||
|
||||
self.isOffline = YES;
|
||||
[self showOfflineNotifier];
|
||||
return;
|
||||
}
|
||||
|
@ -1242,6 +1245,7 @@ heightForHeaderInSection:(NSInteger)section {
|
|||
inFeeds:[request.userInfo objectForKey:@"feeds"]
|
||||
cutoffTimestamp:[[request.userInfo objectForKey:@"cutoffTimestamp"] integerValue]];
|
||||
[self showOfflineNotifier];
|
||||
self.isOffline = YES;
|
||||
[self.feedTitlesTable reloadData];
|
||||
}
|
||||
|
||||
|
@ -1251,6 +1255,8 @@ heightForHeaderInSection:(NSInteger)section {
|
|||
return;
|
||||
}
|
||||
|
||||
self.isOffline = NO;
|
||||
|
||||
if ([[request.userInfo objectForKey:@"cutoffTimestamp"] integerValue]) {
|
||||
id feed;
|
||||
if ([[request.userInfo objectForKey:@"feeds"] count] == 1) {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#import <MobileCoreServices/MobileCoreServices.h>
|
||||
|
||||
//#define DEBUG 1
|
||||
#define PROD_DEBUG 1
|
||||
//#define PROD_DEBUG 1
|
||||
|
||||
#ifdef DEBUG
|
||||
#define BACKGROUND_REFRESH_SECONDS -5
|
||||
|
|
Loading…
Add table
Reference in a new issue