Skip to content

Commit 0fcdf4e

Browse files
committed
Move latch to recentCatQuery
1 parent fa680f0 commit 0fcdf4e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ protected void onPostExecute(ArrayList<String> result) {
154154
protected ArrayList<String> recentCatQuery() {
155155
ArrayList<String> items = new ArrayList<String>();
156156

157+
158+
try {
159+
mergeLatch.await();
160+
Log.d(TAG, "Waited for merge");
161+
} catch (InterruptedException e) {
162+
Log.e(TAG, "Interrupted Exception: ", e);
163+
}
164+
157165
try {
158166
Cursor cursor = client.query(
159167
CategoryContentProvider.BASE_URI,
@@ -188,24 +196,16 @@ protected ArrayList<String> mergeItems() {
188196
if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
189197
gpsItems.addAll(MwVolleyApi.getGpsCat());
190198

191-
}
192-
193199
List<String> titleItems = new ArrayList<String>(titleCatQuery());
194200
List<String> recentItems = new ArrayList<String>(recentCatQuery());
195201

196-
try {
197-
mergeLatch.await();
198-
Log.d(TAG, "Waited for merge");
199-
} catch (InterruptedException e) {
200-
Log.e(TAG, "Interrupted Exception: ", e);
201-
}
202-
203202
mergedItems.addAll(gpsItems);
204203
mergedItems.addAll(titleItems);
205204
mergedItems.addAll(recentItems);
206205

207206
//Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code
208207
ArrayList<String> mergedItemsList = new ArrayList<String>(mergedItems);
208+
Log.d(TAG, "Merged item list: " + mergedItemsList);
209209

210210
return mergedItemsList;
211211
}

0 commit comments

Comments
 (0)