From 0fcdf4e5f9fd991733aba3a79d81564dd28b6c0d Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 21 Oct 2016 17:40:37 +1300
Subject: [PATCH] Move latch to recentCatQuery

---
 .../category/CategorizationFragment.java       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
index c51394dd4..53e18e810 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -154,6 +154,14 @@ public class CategorizationFragment extends Fragment {
     protected ArrayList<String> recentCatQuery() {
         ArrayList<String> items = new ArrayList<String>();
 
+
+        try {
+            mergeLatch.await();
+            Log.d(TAG, "Waited for merge");
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Interrupted Exception: ", e);
+        }
+
         try {
             Cursor cursor = client.query(
                     CategoryContentProvider.BASE_URI,
@@ -188,24 +196,16 @@ public class CategorizationFragment extends Fragment {
         if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
             gpsItems.addAll(MwVolleyApi.getGpsCat());
 
-        }
-
         List<String> titleItems = new ArrayList<String>(titleCatQuery());
         List<String> recentItems = new ArrayList<String>(recentCatQuery());
 
-        try {
-            mergeLatch.await();
-            Log.d(TAG, "Waited for merge");
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Interrupted Exception: ", e);
-        }
-
         mergedItems.addAll(gpsItems);
         mergedItems.addAll(titleItems);
         mergedItems.addAll(recentItems);
 
         //Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code
         ArrayList<String> mergedItemsList = new ArrayList<String>(mergedItems);
+        Log.d(TAG, "Merged item list: " + mergedItemsList);
 
         return mergedItemsList;
     }