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 recentCatQuery() { ArrayList items = new ArrayList(); + + 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 titleItems = new ArrayList(titleCatQuery()); List recentItems = new ArrayList(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 mergedItemsList = new ArrayList(mergedItems); + Log.d(TAG, "Merged item list: " + mergedItemsList); return mergedItemsList; }