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

Add latch to wait for title results

Browse source
This commit is contained in:
misaochan 2016-10-21 17:18:57 +13:00
parent 5254f7a808
commit fc20178904
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,10 +76,12 @@ public class CategorizationFragment extends Fragment {
// LHS guarantees ordered insertions, allowing for prioritized method A results // LHS guarantees ordered insertions, allowing for prioritized method A results
private final Set<String> results = new LinkedHashSet<String>(); private final Set<String> results = new LinkedHashSet<String>();
private final ArrayList<String> titleCatItems = new ArrayList<String>();
PrefixUpdater prefixUpdaterSub; PrefixUpdater prefixUpdaterSub;
MethodAUpdater methodAUpdaterSub; MethodAUpdater methodAUpdaterSub;
private final ArrayList<String> titleCatItems = new ArrayList<String>();
final CountDownLatch mergeLatch = new CountDownLatch(2);
private ContentProviderClient client; private ContentProviderClient client;
protected final static int SEARCH_CATS_LIMIT = 25; protected final static int SEARCH_CATS_LIMIT = 25;
@ -135,6 +137,7 @@ public class CategorizationFragment extends Fragment {
protected void onPostExecute(ArrayList<String> result) { protected void onPostExecute(ArrayList<String> result) {
super.onPostExecute(result); super.onPostExecute(result);
titleCatItems.addAll(result); titleCatItems.addAll(result);
mergeLatch.countDown();
} }
}; };
Utils.executeAsyncTask(titleCategoriesSub); Utils.executeAsyncTask(titleCategoriesSub);
@ -169,6 +172,7 @@ public class CategorizationFragment extends Fragment {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
mergeLatch.countDown();
return items; return items;
} }
@ -177,6 +181,7 @@ public class CategorizationFragment extends Fragment {
* @return a list containing merged categories * @return a list containing merged categories
*/ */
protected ArrayList<String> mergeItems() { protected ArrayList<String> mergeItems() {
Set<String> mergedItems = new LinkedHashSet<String>(); Set<String> mergedItems = new LinkedHashSet<String>();
if (MwVolleyApi.GpsCatExists.getGpsCatExists()) { if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
@ -192,6 +197,11 @@ public class CategorizationFragment extends Fragment {
//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);
try {
mergeLatch.await();
} catch (InterruptedException e) {
Log.e(TAG, "Interrupted Exception: ", e);
}
return mergedItemsList; return mergedItemsList;
} }