diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index ff1d72fba..3bada7fe5 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -71,7 +71,10 @@ public class MethodAUpdater extends AsyncTask> { //if user types in something that is in cache, return cached category if(catFragment.categoriesCache.containsKey(filter)) { - return catFragment.categoriesCache.get(filter); + ArrayList cachedItems = new ArrayList(catFragment.categoriesCache.get(filter)); + Log.d(TAG, "Found cache items, waiting for filter"); + ArrayList filteredItems = new ArrayList(filterYears(cachedItems)); + return filteredItems; } //otherwise if user has typed something in that isn't in cache, search API for matching categories @@ -103,6 +106,8 @@ public class MethodAUpdater extends AsyncTask> { categories.add(catString); } - return categories; + Log.d(TAG, "Found categories from Method A search, waiting for filter"); + ArrayList filteredItems = new ArrayList(filterYears(categories)); + return filteredItems; } } 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 400eee3af..ad88e3b0d 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 @@ -76,7 +76,10 @@ public class PrefixUpdater extends AsyncTask> { //if user types in something that is in cache, return cached category if(catFragment.categoriesCache.containsKey(filter)) { - return catFragment.categoriesCache.get(filter); + ArrayList cachedItems = new ArrayList(catFragment.categoriesCache.get(filter)); + Log.d(TAG, "Found cache items, waiting for filter"); + ArrayList filteredItems = new ArrayList(filterYears(cachedItems)); + return filteredItems; } //otherwise if user has typed something in that isn't in cache, search API for matching categories @@ -102,6 +105,8 @@ public class PrefixUpdater extends AsyncTask> { categories.add(categoryNode.getDocument().getTextContent()); } - return categories; + Log.d(TAG, "Found categories from Prefix search, waiting for filter"); + ArrayList filteredItems = new ArrayList(filterYears(categories)); + return filteredItems; } }