mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

check for exact category match on upload search (#5328)

Browse source
This commit is contained in:
Dean Stirrat 2023-10-07 06:30:27 -07:00 • committed by GitHub
parent 048b78a03a
commit 05fbfce865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
View file

@ -83,7 +83,8 @@ class CategoriesPresenter @Inject constructor(
if (media == null) {
return repository.searchAll(term, getImageTitleList(), repository.selectedDepictions)
.subscribeOn(ioScheduler)
.map { it.filterNot { categoryItem -> repository.containsYear(categoryItem.name) } }
.map { it.filter { categoryItem -> !repository.containsYear(categoryItem.name)
|| categoryItem.name==term } }
} else {
return Observable.zip(
repository.getCategories(repository.selectedExistingCategories)
@ -97,7 +98,8 @@ class CategoriesPresenter @Inject constructor(
}
)
.subscribeOn(ioScheduler)
.map { it.filterNot { categoryItem -> repository.containsYear(categoryItem.name) } }
.map { it.filter { categoryItem -> !repository.containsYear(categoryItem.name)
|| categoryItem.name==term } }
.map { it.filterNot { categoryItem -> categoryItem.thumbnail == "hidden" } }
}
}