rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix and update max search

Browse Source
This commit is contained in:
J-Jamet
2022-02-08 14:49:25 +01:00
parent 2ad385acb6
commit f44e648ccc
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
View File

@@ -70,15 +70,18 @@ class SearchHelper {
},
object : NodeHandler<Group>() {
override fun operate(node: Group): Boolean {
val inRecycleBin = database.groupIsInRecycleBin(node)
val inTemplates = database.groupIsInTemplates(node)
return when {
incrementEntry >= max -> false
searchParameters.searchInRecycleBin -> inRecycleBin
searchParameters.searchInTemplates -> inTemplates
(allowSearchable && searchParameters.searchInSearchableGroup) -> node.isSearchable()
else -> !inRecycleBin && !inTemplates
}
return if (incrementEntry >= max)
false
else if (database.groupIsInRecycleBin(node))
searchParameters.searchInRecycleBin
else if (database.groupIsInTemplates(node))
searchParameters.searchInTemplates
else if (!allowSearchable)
true
else if (searchParameters.searchInSearchableGroup)
node.isSearchable()
else
true
}
},
false)
@@ -100,7 +103,7 @@ class SearchHelper {
}
companion object {
const val MAX_SEARCH_ENTRY = 500
const val MAX_SEARCH_ENTRY = 1000
/**
* Method to show the number of search results with max results