@@ -154,6 +154,14 @@ protected void onPostExecute(ArrayList<String> result) {
154
154
protected ArrayList <String > recentCatQuery () {
155
155
ArrayList <String > items = new ArrayList <String >();
156
156
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
+
157
165
try {
158
166
Cursor cursor = client .query (
159
167
CategoryContentProvider .BASE_URI ,
@@ -188,24 +196,16 @@ protected ArrayList<String> mergeItems() {
188
196
if (MwVolleyApi .GpsCatExists .getGpsCatExists ()) {
189
197
gpsItems .addAll (MwVolleyApi .getGpsCat ());
190
198
191
- }
192
-
193
199
List <String > titleItems = new ArrayList <String >(titleCatQuery ());
194
200
List <String > recentItems = new ArrayList <String >(recentCatQuery ());
195
201
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
-
203
202
mergedItems .addAll (gpsItems );
204
203
mergedItems .addAll (titleItems );
205
204
mergedItems .addAll (recentItems );
206
205
207
206
//Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code
208
207
ArrayList <String > mergedItemsList = new ArrayList <String >(mergedItems );
208
+ Log .d (TAG , "Merged item list: " + mergedItemsList );
209
209
210
210
return mergedItemsList ;
211
211
}
0 commit comments