Merge pull request #212 from ParsePlatform/nlutsenko.qvc.task

Fix never succesfully completed task of -loadObjects in Query/Collection View Controllers.
parse-community · Dec 8, 2015 · cc318dd · cc318dd
2 parents a10d3cc + f653e1f
commit cc318dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/ParseUI/Classes/QueryCollectionViewController/PFQueryCollectionViewController.m b/ParseUI/Classes/QueryCollectionViewController/PFQueryCollectionViewController.m
@@ -234,10 +234,10 @@ - (void)removeObjectsAtIndexPaths:(NSArray *)indexPaths {
     self.loading = YES;
     [self objectsWillLoad];
 
-    BFTaskCompletionSource *source = [BFTaskCompletionSource taskCompletionSource];
-
     PFQuery *query = [self queryForCollection];
     [self _alterQuery:query forLoadingPage:page];
+
+    BFTaskCompletionSource PF_GENERIC(NSArray<__kindof PFObject *>*)*source = [BFTaskCompletionSource taskCompletionSource];
     [query findObjectsInBackgroundWithBlock:^(NSArray *foundObjects, NSError *error) {
         if (![Parse isLocalDatastoreEnabled] &&
             query.cachePolicy != kPFCachePolicyCacheOnly &&
@@ -266,9 +266,12 @@ - (void)removeObjectsAtIndexPaths:(NSArray *)indexPaths {
         [self objectsDidLoad:error];
         [self.refreshControl endRefreshing];
 
-        [source setError:error];
+        if (error) {
+            [source trySetError:error];
+        } else {
+            [source trySetResult:foundObjects];
+        }
     }];
-
     return source.task;
 }
 

diff --git a/ParseUI/Classes/QueryTableViewController/PFQueryTableViewController.m b/ParseUI/Classes/QueryTableViewController/PFQueryTableViewController.m
@@ -220,10 +220,10 @@ - (void)clear {
     self.loading = YES;
     [self objectsWillLoad];
 
-    BFTaskCompletionSource *source = [BFTaskCompletionSource taskCompletionSource];
-
     PFQuery *query = [self queryForTable];
     [self _alterQuery:query forLoadingPage:page];
+
+    BFTaskCompletionSource PF_GENERIC(NSArray<__kindof PFObject *>*)*source = [BFTaskCompletionSource taskCompletionSource];
     [query findObjectsInBackgroundWithBlock:^(NSArray *foundObjects, NSError *error) {
         if (![Parse isLocalDatastoreEnabled] &&
             query.cachePolicy != kPFCachePolicyCacheOnly &&
@@ -252,7 +252,11 @@ - (void)clear {
         [self objectsDidLoad:error];
         [self.refreshControl endRefreshing];
 
-        [source setError:error];
+        if (error) {
+            [source trySetError:error];
+        } else {
+            [source trySetResult:foundObjects];
+        }
     }];
 
     return source.task;