Remove simulated pull to refresh from most views

WordPress/Classes/CommentsViewController.m

@@ -62,11 +62,6 @@ - (void)viewDidLoad {
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
 }
 
-- (UIColor *)backgroundColorForRefreshHeaderView
-{
-    return [WPStyleGuide itsEverywhereGrey];
-}
-
 - (void)viewWillAppear:(BOOL)animated {
     WPFLogMethod();
 
@@ -145,7 +140,7 @@ - (void)setWantedCommentId:(NSNumber *)wantedCommentId {
                 [self willChangeValueForKey:@"wantedCommentId"];
                 _wantedCommentId = wantedCommentId;
                 [self didChangeValueForKey:@"wantedCommentId"];
-                [self syncItemsWithUserInteraction:NO];
+                [self syncItems];
             }
         }
     }
@@ -228,7 +223,7 @@ - (UITableViewCell *)newCell {
     return cell;
 }
 
-- (void)syncItemsWithUserInteraction:(BOOL)userInteraction success:(void (^)())success failure:(void (^)(NSError *))failure {
+- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
     [self.blog syncCommentsWithSuccess:success failure:failure];
 }
 

WordPress/Classes/NotificationsViewController.m

@@ -77,9 +77,13 @@ - (void)viewDidAppear:(BOOL)animated {
     }
 
     _isPushingViewController = NO;
-    // If table is at the top, simulate a pull to refresh
-    BOOL simulatePullToRefresh = (self.tableView.contentOffset.y == 0);
-    [self syncItemsWithUserInteraction:simulatePullToRefresh];
+
+    // If table is at the top (i.e. freshly opened), do some extra work
+    if (self.tableView.contentOffset.y == 0) {
+        [self pruneOldNotes];
+    }
+
+    [self syncItems];
     [self refreshUnreadNotes];
 }
 
@@ -89,10 +93,6 @@ - (void)viewDidDisappear:(BOOL)animated {
         [self pruneOldNotes];
 }
 
-- (UIColor *)backgroundColorForRefreshHeaderView
-{
-    return [WPStyleGuide itsEverywhereGrey];
-}
 
 #pragma mark - Custom methods
 
@@ -141,7 +141,7 @@ - (void)refreshFromPushNotification {
         [self.panelNavigationController popToRootViewControllerAnimated:YES];
     [self.tableView scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
     if (![self isSyncing]) {
-        [self syncItemsWithUserInteraction:NO];
+        [self syncItems];
     }
 }
 
@@ -234,10 +234,12 @@ - (void)configureCell:(NewNotificationsTableViewCell *)cell atIndexPath:(NSIndex
     cell.note = [self.resultsController objectAtIndexPath:indexPath];
 }
 
-- (void)syncItemsWithUserInteraction:(BOOL)userInteraction success:(void (^)())success failure:(void (^)(NSError *error))failure {
-    if (userInteraction) {
-        [self pruneOldNotes];
-    }
+- (void)syncItemsViaUserInteractionWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
+    [self pruneOldNotes];
+    [self syncItemsWithSuccess:success failure:failure];
+}
+
+- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure {
     NSNumber *timestamp;
     NSArray *notes = [self.resultsController fetchedObjects];
     if ([notes count] > 0) {

WordPress/Classes/PagesViewController.m

@@ -33,7 +33,7 @@ - (NSString *)noResultsText
 }
 
 
-- (void)syncItemsWithUserInteraction:(BOOL)userInteraction success:(void (^)())success failure:(void (^)(NSError *))failure {
+- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
     [self.blog syncPagesWithSuccess:success failure:failure loadMore: NO];
 }
 

WordPress/Classes/PostsViewController.m

@@ -126,11 +126,6 @@ - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (UIColor *)backgroundColorForRefreshHeaderView
-{
-    return [WPStyleGuide itsEverywhereGrey];
-}
-
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
     WordPressAppDelegate *delegate = (WordPressAppDelegate*)[[UIApplication sharedApplication] delegate];
 
@@ -248,7 +243,7 @@ - (void)deletePostAtIndexPath:(NSIndexPath *)indexPath{
 		} else {
 			[[NSNotificationCenter defaultCenter] postNotificationName:kXML_RPC_ERROR_OCCURS object:error userInfo:errInfo];
 		}
-        [self syncItemsWithUserInteraction:NO];
+        [self syncItems];
         if(IS_IPAD && self.postReaderViewController) {
             if(self.postReaderViewController.apost == post) {
                 //push an the W logo on the right. 
@@ -368,13 +363,13 @@ - (NSString *)sectionNameKeyPath {
     return @"remoteStatusNumber";
 }
 
-- (void)syncItemsWithUserInteraction:(BOOL)userInteraction success:(void (^)())success failure:(void (^)(NSError *))failure {
+- (void)syncItemsViaUserInteractionWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
     // If triggered by a pull to refresh, sync categories, post formats, ...
-    if (userInteraction) {
-        [self.blog syncBlogPostsWithSuccess:success failure:failure];
-    } else {
-        [self.blog syncPostsWithSuccess:success failure:failure loadMore:NO];
-    }
+    [self.blog syncBlogPostsWithSuccess:success failure:failure];
+}
+
+- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
+    [self.blog syncPostsWithSuccess:success failure:failure loadMore:NO];
 }
 
 - (UITableViewCell *)newCell {

WordPress/Classes/ReaderPostsViewController.m

@@ -54,7 +54,6 @@ - (void)fetchBlogsAndPrimaryBlog;
 - (void)handleReblogButtonTapped:(id)sender;
 - (void)showReblogForm;
 - (void)hideReblogForm;
-- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure;
 - (void)onSyncSuccess:(AFHTTPRequestOperation *)operation response:(id)responseObject;
 - (void)handleKeyboardDidShow:(NSNotification *)notification;
 - (void)handleKeyboardWillHide:(NSNotification *)notification;
@@ -629,11 +628,11 @@ - (BOOL)hasMoreContent {
 }
 
 
-- (void)syncItemsWithUserInteraction:(BOOL)userInteraction success:(void (^)())success failure:(void (^)(NSError *))failure {
+- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
     WPFLogMethod();
     // if needs auth.
     if([WPCookie hasCookieForURL:[NSURL URLWithString:@"https://wordpress.com"] andUsername:[[WPAccount defaultWordPressComAccount] username]]) {
-       [self syncItemsWithSuccess:success failure:failure];
+       [self syncReaderItemsWithSuccess:success failure:failure];
         return;
     }
 
@@ -656,17 +655,17 @@ - (void)syncItemsWithUserInteraction:(BOOL)userInteraction success:(void (^)())s
     AFHTTPRequestOperation *authRequest = [[AFHTTPRequestOperation alloc] initWithRequest:mRequest];
     [authRequest setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
         [[WordPressAppDelegate sharedWordPressApplicationDelegate] useAppUserAgent];
-        [self syncItemsWithSuccess:success failure:failure];
+        [self syncReaderItemsWithSuccess:success failure:failure];
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
         [[WordPressAppDelegate sharedWordPressApplicationDelegate] useAppUserAgent];
-        [self syncItemsWithSuccess:success failure:failure];
+        [self syncReaderItemsWithSuccess:success failure:failure];
     }];
 
     [authRequest start];    
 }
 
 
-- (void)syncItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
+- (void)syncReaderItemsWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
     WPFLogMethod();
 	NSString *endpoint = [ReaderPost currentEndpoint];
 	NSNumber *numberToSync = [NSNumber numberWithInteger:ReaderPostsToSync];
@@ -834,9 +833,6 @@ - (void)readerTopicChanged {
     if ([WordPressAppDelegate sharedWordPressApplicationDelegate].connectionAvailable == YES && ![self isSyncing] ) {
 		[[NSUserDefaults standardUserDefaults] removeObjectForKey:ReaderLastSyncDateKey];
 		[NSUserDefaults resetStandardUserDefaults];
-		if (IS_IPAD) {
-			[self simulatePullToRefresh];
-		}
     }
 
     if ([self isCurrentCategoryFreshlyPressed]) {

WordPress/Classes/WPTableViewController.h

@@ -9,16 +9,13 @@
 #import "Blog.h"
 #import "SettingsViewControllerDelegate.h"
 
-//@interface WPTableViewController : UITableViewController <NSFetchedResultsControllerDelegate, UIAlertViewDelegate, SettingsViewControllerDelegate>
-@interface WPTableViewController : UIViewController <UITableViewDataSource, UITableViewDelegate, NSFetchedResultsControllerDelegate, UIAlertViewDelegate, SettingsViewControllerDelegate>
+@interface WPTableViewController : UITableViewController <UITableViewDataSource, UITableViewDelegate, NSFetchedResultsControllerDelegate, UIAlertViewDelegate, SettingsViewControllerDelegate>
 
 @property (nonatomic, strong) Blog *blog;
-@property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, readonly) BOOL isScrolling;
 @property (nonatomic) BOOL incrementalLoadingSupported;
 
 - (void)promptForPassword;
-- (UIColor *)backgroundColorForRefreshHeaderView;
 - (NSString *)noResultsText;
 
 @end