Merge pull request #76 from ParsePlatform/wangmengyan.fix_ParseQueryAdapter_in_LDS_mode

Fix ParseQueryAdapter in LDS mode

Author: wangmengyan95

ParseLoginUI/src/androidTest/java/com/parse/ParseQueryAdapterOfflineEnabledTest.java

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2014, Parse, LLC. All rights reserved.
+ *
+ *  You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+ *  copy, modify, and distribute this software in source code or binary form for use
+ *  in connection with the web services and APIs provided by Parse.
+ *
+ *  As with any software that integrates with the Parse platform, your use of
+ *  this software is subject to the Parse Terms of Service
+ *  [https://www.parse.com/about/terms]. This copyright notice shall be
+ *  included in all copies or substantial portions of the software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ *  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ *  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ *  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+package com.parse;
+
+public class ParseQueryAdapterOfflineEnabledTest extends ParseQueryAdapterTest {
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    Parse.enableLocalDatastore(null);
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    Parse.disableLocalDatastore();
+    super.tearDown();
+  }
+
+  @Override
+  public void testLoadObjectsWithCacheThenNetworkQueryAndPagination() throws Exception {
+    // Do nothing, there is no cache policy when LDS is enabled.
+  }
+}

ParseLoginUI/src/main/java/com/parse/ParseQueryAdapter.java

@@ -144,7 +144,8 @@ public static interface OnQueryLoadListener<T extends ParseObject> {
 
   private List<T> objects = new ArrayList<>();
 
-  private Set<ParseQuery> runningQueries = Collections.newSetFromMap(new ConcurrentHashMap<ParseQuery, Boolean>());
+  private Set<ParseQuery> runningQueries =
+      Collections.newSetFromMap(new ConcurrentHashMap<ParseQuery, Boolean>());
 
 
   // Used to keep track of the pages of objects when using CACHE_THEN_NETWORK. When using this,
@@ -375,7 +376,8 @@ private void loadObjects(final int page, final boolean shouldClear) {
       objectPages.add(page, new ArrayList<T>());
     }
 
-    // In the case of CACHE_THEN_NETWORK, two callbacks will be called. Using this flag to keep track,
+    // In the case of CACHE_THEN_NETWORK, two callbacks will be called. Using this flag to keep
+    // track of the callbacks.
     final Capture<Boolean> firstCallBack = new Capture<>(true);
 
     runningQueries.add(query);
@@ -390,18 +392,22 @@ public void done(List<T> foundObjects, ParseException e) {
         }
         // In the case of CACHE_THEN_NETWORK, two callbacks will be called. We can only remove the
         // query after the second callback.
-        if (query.getCachePolicy() != CachePolicy.CACHE_THEN_NETWORK ||
-                (query.getCachePolicy() == CachePolicy.CACHE_THEN_NETWORK && !firstCallBack.get())) {
+        if (Parse.isLocalDatastoreEnabled() ||
+            (query.getCachePolicy() != CachePolicy.CACHE_THEN_NETWORK) ||
+            (query.getCachePolicy() == CachePolicy.CACHE_THEN_NETWORK && !firstCallBack.get())) {
           runningQueries.remove(query);
         }
+
         if ((!Parse.isLocalDatastoreEnabled() &&
-                query.getCachePolicy() == CachePolicy.CACHE_ONLY)
-                && (e != null) && e.getCode() == ParseException.CACHE_MISS) {
+            query.getCachePolicy() == CachePolicy.CACHE_ONLY) &&
+            (e != null) && e.getCode() == ParseException.CACHE_MISS) {
           // no-op on cache miss
           return;
         }
 
-        if ((e != null) && ((e.getCode() == ParseException.CONNECTION_FAILED) || (e.getCode() != ParseException.CACHE_MISS))) {
+        if ((e != null) &&
+            ((e.getCode() == ParseException.CONNECTION_FAILED) ||
+                (e.getCode() != ParseException.CACHE_MISS))) {
           hasNextPage = true;
         } else if (foundObjects != null) {
           if (shouldClear && firstCallBack.get()) {