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

Moved addAll lines to after latch.await()

Browse source
This commit is contained in:
misaochan 2016-10-21 17:29:03 +13:00
parent 82b5904a68
commit fa680f0369
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,28 +181,32 @@ public class CategorizationFragment extends Fragment {
protected ArrayList<String> mergeItems() { protected ArrayList<String> mergeItems() {
Set<String> mergedItems = new LinkedHashSet<String>(); 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()) { if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
List<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat()); gpsItems.addAll(MwVolleyApi.getGpsCat());
mergedItems.addAll(gpsItems);
} }
List<String> titleItems = new ArrayList<String>(titleCatQuery()); List<String> titleItems = new ArrayList<String>(titleCatQuery());
mergedItems.addAll(titleItems);
List<String> recentItems = new ArrayList<String>(recentCatQuery()); 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 { try {
mergeLatch.await(); mergeLatch.await();
Log.d(TAG, "Waited for merge"); Log.d(TAG, "Waited for merge");
} catch (InterruptedException e) { } catch (InterruptedException e) {
Log.e(TAG, "Interrupted Exception: ", 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; return mergedItemsList;
} }