From 9a475ef3c98c940b1db9ae65a19c251187c35549 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Thu, 27 Oct 2016 16:37:36 +1300
Subject: [PATCH] Add filterYears() call to all category return methods

---
 .../fr/free/nrw/commons/category/MethodAUpdater.java     | 9 +++++++--
 .../java/fr/free/nrw/commons/category/PrefixUpdater.java | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

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<Void, Void, ArrayList<String>> {
 
         //if user types in something that is in cache, return cached category
         if(catFragment.categoriesCache.containsKey(filter)) {
-            return catFragment.categoriesCache.get(filter);
+            ArrayList<String> cachedItems = new ArrayList<String>(catFragment.categoriesCache.get(filter));
+            Log.d(TAG, "Found cache items, waiting for filter");
+            ArrayList<String> filteredItems = new ArrayList<String>(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<Void, Void, ArrayList<String>> {
             categories.add(catString);
         }
 
-        return categories;
+        Log.d(TAG, "Found categories from Method A search, waiting for filter");
+        ArrayList<String> filteredItems = new ArrayList<String>(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<Void, Void, ArrayList<String>> {
 
         //if user types in something that is in cache, return cached category
         if(catFragment.categoriesCache.containsKey(filter)) {
-            return catFragment.categoriesCache.get(filter);
+            ArrayList<String> cachedItems = new ArrayList<String>(catFragment.categoriesCache.get(filter));
+            Log.d(TAG, "Found cache items, waiting for filter");
+            ArrayList<String> filteredItems = new ArrayList<String>(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<Void, Void, ArrayList<String>> {
             categories.add(categoryNode.getDocument().getTextContent());
         }
 
-        return categories;
+        Log.d(TAG, "Found categories from Prefix search, waiting for filter");
+        ArrayList<String> filteredItems = new ArrayList<String>(filterYears(categories));
+        return filteredItems;
     }
 }