mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move latch to recentCatQuery

Browse source
This commit is contained in:
misaochan 2016-10-21 17:40:37 +13:00
parent fa680f0369
commit 0fcdf4e5f9
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -154,6 +154,14 @@ public class CategorizationFragment extends Fragment {
protected ArrayList<String> recentCatQuery() { protected ArrayList<String> recentCatQuery() {
ArrayList<String> items = new ArrayList<String>(); 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 { try {
Cursor cursor = client.query( Cursor cursor = client.query(
CategoryContentProvider.BASE_URI, CategoryContentProvider.BASE_URI,
@ -188,24 +196,16 @@ public class CategorizationFragment extends Fragment {
if (MwVolleyApi.GpsCatExists.getGpsCatExists()) { if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
gpsItems.addAll(MwVolleyApi.getGpsCat()); gpsItems.addAll(MwVolleyApi.getGpsCat());
}
List<String> titleItems = new ArrayList<String>(titleCatQuery()); List<String> titleItems = new ArrayList<String>(titleCatQuery());
List<String> recentItems = new ArrayList<String>(recentCatQuery()); 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(gpsItems);
mergedItems.addAll(titleItems); mergedItems.addAll(titleItems);
mergedItems.addAll(recentItems); mergedItems.addAll(recentItems);
//Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code //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); ArrayList<String> mergedItemsList = new ArrayList<String>(mergedItems);
Log.d(TAG, "Merged item list: " + mergedItemsList);
return mergedItemsList; return mergedItemsList;
} }