Merge pull request #15 from grigaci/bugs/fixBatchRequestOptions

Fix feed table view batch request with multiple options
grigaci · Dec 15, 2015 · 69038fc · 69038fc
2 parents c6b6327 + 3fde8be
commit 69038fc
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/BIObjCHelpers/Datasource/TableView/BIDatasourceFeedTableView.m b/BIObjCHelpers/Datasource/TableView/BIDatasourceFeedTableView.m
@@ -109,17 +109,11 @@ - (void)fetchBatchRequest:(nonnull BIBatchRequest *)batchRequest {
 }
 
 - (void)updateTableViewForFetchBatchRequest:(nonnull BIBatchRequest *)batchRequest {
-    if (batchRequest.isInitialRequest) {
+    if (batchRequest.isInitialRequest || batchRequest.isInfiniteScrollingRequest) {
         self.tableView.BI_pullToRefreshEnabled = NO;
         self.fetchingState = BIDatasourceTableViewFetchingStateInfiniteScrolling;
         self.tableView.infiniteScrollingState = BIInfiniteScrollingStateLoading;
-    }
-    if (batchRequest.isInfiniteScrollingRequest) {
-        self.tableView.BI_pullToRefreshEnabled = NO;
-        self.fetchingState = BIDatasourceTableViewFetchingStateInfiniteScrolling;
-        self.tableView.infiniteScrollingState = BIInfiniteScrollingStateLoading;
-    }
-    if (batchRequest.isPullToRefreshRequest) {
+    } else if (batchRequest.isPullToRefreshRequest) {
         self.tableView.BI_infiniteScrollingEnabled = NO;
         self.fetchingState = BIDatasourceTableViewFetchingStatePullToRefresh;
         [self.tableView.pullToRefreshControl beginRefreshing];