From fa680f0369e24b0b4479df561c9b9f791ef84856 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Fri, 21 Oct 2016 17:29:03 +1300
Subject: [PATCH] Moved addAll lines to after latch.await()

---
 .../category/CategorizationFragment.java      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 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 895ce4212..c51394dd4 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
@@ -181,28 +181,32 @@ public class CategorizationFragment extends Fragment {
     protected ArrayList<String> mergeItems() {
 
         Set<String> mergedItems = new LinkedHashSet<String>();
+        List<String> gpsItems = new ArrayList<String>();
 
-        Log.d(TAG, "Merging items...");
+        Log.d(TAG, "Calling APIs for GPS cats, title cats and recent cats...");
 
         if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
-            List<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat());
-            mergedItems.addAll(gpsItems);
+            gpsItems.addAll(MwVolleyApi.getGpsCat());
+
         }
 
         List<String> titleItems = new ArrayList<String>(titleCatQuery());
-        mergedItems.addAll(titleItems);
-
         List<String> recentItems = new ArrayList<String>(recentCatQuery());
-        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);
         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);
+
         return mergedItemsList;
     }