diff options
Diffstat (limited to 'Juick/ViewControllers/MessagesViewController.m')
| -rw-r--r-- | Juick/ViewControllers/MessagesViewController.m | 127 |
1 files changed, 77 insertions, 50 deletions
diff --git a/Juick/ViewControllers/MessagesViewController.m b/Juick/ViewControllers/MessagesViewController.m index d3bd8aa..7814d1e 100644 --- a/Juick/ViewControllers/MessagesViewController.m +++ b/Juick/ViewControllers/MessagesViewController.m @@ -19,66 +19,82 @@ NSString* const messageCellIdentifier = @"messageCell"; + +@interface MessagesViewController() + +@property(nonatomic, assign) Boolean initialDataLoaded; + +-(void) applicationActivated; + +@end + @implementation MessagesViewController - (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; self.navigationController.visibleViewController.title = self.title; } -(void) refreshData { - if ([self.path length] > 0) { - self.dataLoading = YES; - if (self.messages.count == 0) { - [self.tableView reloadData]; - } - [[AppDelegate shared].api pullNextFromPath:self.path params:self.params callback:^(NSArray *next, NSError *err) { - if (err) { - [User throwUnableToLogin:self error:err path:self.path params:self.params]; - return; + UIApplicationState state = [UIApplication sharedApplication].applicationState; + if (state == UIApplicationStateActive && self.dataLoading == NO) { + if ([self.path length] > 0) { + self.dataLoading = YES; + if (self.messages.count == 0) { + [self.tableView reloadData]; } - NSArray *newMsgs = next; - if ([self isAtTop:self.params]) { - if (![self.path isEqualToString:[API threadUrl]]) { - [self.messages removeAllObjects]; - [self.tableView reloadData]; + [[AppDelegate shared].api pullNextFromPath:self.path params:self.params callback:^(NSArray *next, NSError *err) { + if (!self.initialDataLoaded) { + self.initialDataLoaded = YES; } - } - NSUInteger oldCount = [self.messages count]; - if ([self.path isEqualToString:[API threadUrl]]) { - NSUInteger lastRid = [((Message *)[self.messages lastObject]).rid unsignedIntegerValue] + 1; - NSUInteger count = [next count]; - if (oldCount > 0) { - if (lastRid && lastRid < count) { - newMsgs = [next subarrayWithRange:NSMakeRange(lastRid, count - lastRid)]; - } else { - [self.refreshControl endRefreshing]; - return; + self.dataLoading = NO; + if (err) { + [User throwUnableToLogin:self error:err path:self.path params:self.params]; + return; + } + NSArray *newMsgs = next; + if ([self isAtTop:self.params]) { + if (![self.path isEqualToString:[API threadUrl]]) { + [self.messages removeAllObjects]; + [self.tableView reloadData]; } } - } - self.dataLoading = NO; - if (self.messages.count == 0) { - [self.tableView reloadData]; - } - [self.messages addObjectsFromArray:newMsgs]; - NSMutableArray *indexPaths = [NSMutableArray new]; - for (NSUInteger index = oldCount; index <= oldCount + [newMsgs count] - 1; index++) { - [indexPaths addObject:[NSIndexPath indexPathForRow:index inSection: 0]]; - } - [self.tableView beginUpdates]; - [self.tableView insertRowsAtIndexPaths:indexPaths withRowAnimation:NO]; - [self.tableView endUpdates]; - [self.refreshControl endRefreshing]; - if (self.shouldScrollToUnreadOnRefresh) { - NSInteger messagesCount = [self.messages count]; - if (messagesCount > 0) { - NSInteger itemToScroll = [self.firstUnread integerValue] ? : self.messages.count - 1; - NSIndexPath *lastRow = [NSIndexPath indexPathForRow:MIN(itemToScroll, messagesCount - 1) inSection:0]; - [self.tableView scrollToRowAtIndexPath:lastRow atScrollPosition:UITableViewScrollPositionBottom animated:NO]; + NSUInteger oldCount = [self.messages count]; + if ([self.path isEqualToString:[API threadUrl]]) { + NSUInteger lastRid = [((Message *)[self.messages lastObject]).rid unsignedIntegerValue] + 1; + NSUInteger count = [next count]; + if (oldCount > 0) { + if (lastRid && lastRid < count) { + newMsgs = [next subarrayWithRange:NSMakeRange(lastRid, count - lastRid)]; + } else { + [self.refreshControl endRefreshing]; + return; + } + } } - self.firstUnread = nil; - } - }]; + if (self.messages.count == 0) { + [self.tableView reloadData]; + } + [self.messages addObjectsFromArray:newMsgs]; + NSMutableArray *indexPaths = [NSMutableArray new]; + for (NSUInteger index = oldCount; index <= oldCount + [newMsgs count] - 1; index++) { + [indexPaths addObject:[NSIndexPath indexPathForRow:index inSection: 0]]; + } + [self.tableView beginUpdates]; + [self.tableView insertRowsAtIndexPaths:indexPaths withRowAnimation:NO]; + [self.tableView endUpdates]; + [self.refreshControl endRefreshing]; + if (self.shouldScrollToUnreadOnRefresh) { + NSInteger messagesCount = [self.messages count]; + if (messagesCount > 0) { + NSInteger itemToScroll = [self.firstUnread integerValue] ? : self.messages.count - 1; + NSIndexPath *lastRow = [NSIndexPath indexPathForRow:MIN(itemToScroll, messagesCount - 1) inSection:0]; + [self.tableView scrollToRowAtIndexPath:lastRow atScrollPosition:UITableViewScrollPositionBottom animated:NO]; + } + self.firstUnread = nil; + } + }]; + } } } @@ -94,7 +110,6 @@ NSString* const messageCellIdentifier = @"messageCell"; - (void)viewDidLoad { [super viewDidLoad]; - self.dataLoading = YES; [self.view setBackgroundColor:[UIColor colorNamed:@"Background"]]; [self.tableView registerNib:[UINib nibWithNibName:@"MessageCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:messageCellIdentifier]; [self.tableView registerNib:[UINib nibWithNibName:@"ContentLoadingCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"contentLoadingCell"]; @@ -105,8 +120,9 @@ NSString* const messageCellIdentifier = @"messageCell"; } self.refreshControl = [UIRefreshControl new]; [self.refreshControl addTarget:self action:@selector(refreshData) forControlEvents:UIControlEventValueChanged]; - [self refreshData]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newMessage:) name:NewMessageNotificationName object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationActivated) name:UIApplicationDidBecomeActiveNotification object:nil]; + [self refreshData]; } - (void) composePressed { @@ -170,4 +186,15 @@ NSString* const messageCellIdentifier = @"messageCell"; [self viewThreadForMessage:msg mid:msg.mid scrollTo:0]; } +- (void)applicationActivated { + if (!self.initialDataLoaded) { + [self refreshData]; + } +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil]; +} + @end |