From 9ea223e32f972f8cb1b73d71031341eb8c8633b1 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 21 Oct 2016 18:04:10 +1300
Subject: [PATCH] Move mergeLatch.await() to a more sensible location

---
 .../category/CategorizationFragment.java      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 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 ac63141e9..a0dae932c 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
@@ -160,14 +160,7 @@ 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,
@@ -195,17 +188,24 @@ public class CategorizationFragment extends Fragment {
     protected ArrayList<String> mergeItems() {
 
         Set<String> mergedItems = new LinkedHashSet<String>();
-        List<String> gpsItems = new ArrayList<String>();
 
         Log.d(TAG, "Calling APIs for GPS cats, title cats and recent cats...");
 
+        List<String> gpsItems = new ArrayList<String>();
         if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
             gpsItems.addAll(MwVolleyApi.getGpsCat());
         }
-
         List<String> titleItems = new ArrayList<String>(titleCatQuery());
         List<String> recentItems = new ArrayList<String>(recentCatQuery());
 
+        //Await results of titleItems, which is likely to come in last
+        try {
+            mergeLatch.await();
+            Log.d(TAG, "Waited for merge");
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Interrupted Exception: ", e);
+        }
+
         mergedItems.addAll(gpsItems);
         Log.d(TAG, "Adding GPS items: " + gpsItems);
         mergedItems.addAll(titleItems);