Backwards compatibility hack to support ParseQueryAdapter#setPaginationEnabled(false)

Author: grantland

ParseUI-Widget/src/main/java/com/parse/ParseQueryAdapter.java

@@ -285,7 +285,9 @@ private ParseQueryPager<T> getPager() {
           protected ParseQuery<T> createQuery(int page) {
             // Workaround for backwards compatibility
             ParseQuery<T> query = new ParseQuery<>(getQuery());
-            setPageOnQuery(page, query);
+            if (paginationEnabled) {
+              setPageOnQuery(page, query);
+            }
             return query;
           }
         };
@@ -296,13 +298,17 @@ protected ParseQuery<T> createQuery(int page) {
     }
   }
 
+  private List<T> getObjects() {
+    return getPager().getObjects();
+  }
+
   /** {@inheritDoc} **/
   @Override
   public T getItem(int index) {
     if (index == getPaginationCellRow()) {
       return null;
     }
-    return getPager().getObjects().get(index);
+    return getObjects().get(index);
   }
 
   /** {@inheritDoc} **/
@@ -412,7 +418,7 @@ public void loadNextPage() {
    */
   @Override
   public int getCount() {
-    int count = getPager().getObjects().size();
+    int count = getObjects().size();
 
     if (shouldShowPaginationCell()) {
       count++;
@@ -619,7 +625,7 @@ public void setAutoload(boolean autoload) {
       return;
     }
     this.autoload = autoload;
-    if (this.autoload && !dataSetObservers.isEmpty() && getPager().getObjects().isEmpty()) {
+    if (this.autoload && !dataSetObservers.isEmpty() && getObjects().isEmpty()) {
       loadObjects();
     }
   }
@@ -655,7 +661,7 @@ private View getDefaultView(Context context) {
   }
 
   private int getPaginationCellRow() {
-    return getPager().getObjects().size();
+    return getObjects().size();
   }
 
   private boolean shouldShowPaginationCell() {

ParseUI-Widget/src/main/java/com/parse/widget/util/ParseQueryPager.java

@@ -250,15 +250,16 @@ public Task<List<T>> loadNextPage(CancellationToken ct) {
     final int page = getCurrentPage() + 1;
 
     // TODO(grantland): Utilize query.findInBackground(CancellationToken)
-    Task<List<T>> task = findAsync(createQuery(page), ct).continueWithTask(new Continuation<List<T>, Task<List<T>>>() {
+    final ParseQuery<T> query = createQuery(page);
+    Task<List<T>> task = findAsync(query, ct).continueWithTask(new Continuation<List<T>, Task<List<T>>>() {
       @Override
       public Task<List<T>> then(Task<List<T>> task) throws Exception {
         if (task.isCancelled() || task.isFaulted()) {
           return task;
         }
 
         List<T> results = task.getResult();
-        onPage(page, results);
+        onPage(query, page, results);
 
         return task;
       }
@@ -296,15 +297,16 @@ public void loadNextPage(final FindCallback<T> callback, final CancellationToken
     final int page = getCurrentPage() + 1;
 
     final TaskCompletionSource<List<T>> tcs = new TaskCompletionSource<>();
-    createQuery(page).findInBackground(new FindCallback<T>() {
+    final ParseQuery<T> query = createQuery(page);
+    query.findInBackground(new FindCallback<T>() {
 
       AtomicInteger callbacks = new AtomicInteger();
 
       @Override
       public void done(List<T> results, ParseException e) {
         boolean isCancelled = ct != null && ct.isCancellationRequested();
         if (!isCancelled && e == null) {
-          onPage(page, results);
+          onPage(query, page, results);
         }
 
         boolean isCacheThenNetwork = false;
@@ -329,16 +331,21 @@ public void done(List<T> results, ParseException e) {
     setLoadNextPageTask(tcs.getTask());
   }
 
-  private void onPage(int page, List<T> results) {
+  private void onPage(ParseQuery<T> query, int page, List<T> results) {
     synchronized (lock) {
       int itemCount = results.size();
 
       currentPage = page;
-      // We detect if there are more pages by setting the limit pageSize + 1 and we remove the extra
-      // if there are more pages.
-      hasNextPage = itemCount >= pageSize + 1;
-      if (itemCount > pageSize) {
-        results.remove(pageSize);
+      if (query.getLimit() == pageSize) {
+        // Backwards compatibility hack to support ParseQueryAdapter#setPaginationEnabled(false)
+        hasNextPage = false;
+      } else {
+        // We detect if there are more pages by setting the limit pageSize + 1 and we remove the extra
+        // if there are more pages.
+        hasNextPage = itemCount >= pageSize + 1;
+        if (itemCount > pageSize) {
+          results.remove(pageSize);
+        }
       }
       int objectsSize = objects.size();
       boolean inserted = true;