diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt index 08efe598d..c69789c21 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt @@ -27,11 +27,12 @@ class CategoriesModel @Inject constructor( private var selectedExistingCategories: MutableList = mutableListOf() /** - * Returns true if the item contains an year which should be ignored - * @param item + * Returns true if an item is considered to be a spammy category which should be ignored + * + * @param item a category item that needs to be validated to know if it is spammy or not * @return */ - fun containsYear(item: String): Boolean { + fun isSpammyCategory(item: String): Boolean { //Check for current and previous year to exclude these categories from removal val now = Calendar.getInstance() val curYear = now[Calendar.YEAR] diff --git a/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java b/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java index 2374ebfc3..d2f095a42 100644 --- a/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java +++ b/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java @@ -149,7 +149,7 @@ public class UploadRepository { * @return */ public boolean containsYear(String name) { - return categoriesModel.containsYear(name); + return categoriesModel.isSpammyCategory(name); } /** diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt index 209566931..218a02b00 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt @@ -156,7 +156,7 @@ class UploadRepositoryUnitTest { @Test fun testContainsYear() { assertEquals( - repository.containsYear(""), categoriesModel.containsYear("") + repository.containsYear(""), categoriesModel.isSpammyCategory("") ) }