From 464d6e0bac390937b7fa7a523fd839efb3b51175 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 27 Oct 2016 16:21:21 +1300 Subject: [PATCH] Add logs and additional var filteredItems to store list --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 2 -- .../java/fr/free/nrw/commons/category/PrefixUpdater.java | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index aad549bef..ca8300172 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -222,8 +222,6 @@ 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 ArrayList mergedItemsList = new ArrayList(mergedItems); - - Log.d(TAG, "Merged item list: " + mergedItemsList); return mergedItemsList; } diff --git a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java index fb50137d9..015b397a7 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java @@ -43,6 +43,7 @@ public class PrefixUpdater extends AsyncTask> { } protected ArrayList filterYears(ArrayList items) { + //Copy to Iterator to prevent ConcurrentModificationException when removing item for(Iterator item = items.iterator(); item.hasNext();) { String s = item.next(); @@ -54,7 +55,8 @@ public class PrefixUpdater extends AsyncTask> { } } - return items; + ArrayList filteredItems = new ArrayList(items); + return filteredItems; } @Override @@ -62,6 +64,7 @@ public class PrefixUpdater extends AsyncTask> { //If user hasn't typed anything in yet, get GPS and recent items if(TextUtils.isEmpty(filter)) { ArrayList mergedItems = new ArrayList(catFragment.mergeItems()); + Log.d(TAG, "Merged items, waiting for filter"); ArrayList filteredItems = new ArrayList(filterYears(mergedItems)); return filteredItems; }