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: Search with space #175

Browse Source
This commit is contained in:
J-Jamet
2025-09-11 16:43:40 +02:00
parent 39d9a74a73
commit 69e7cdbc47
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/kunzisoft/keepass/database/helper/SearchHelper.kt
View File

@@ -59,9 +59,9 @@ object SearchHelper {
&& !searchInfo.containsOnlyNullValues()) { && !searchInfo.containsOnlyNullValues()) {
// If search provide results // If search provide results
database.createVirtualGroupFromSearchInfo( database.createVirtualGroupFromSearchInfo(
searchInfo.toString(), searchInfoString = searchInfo.toString(),
searchInfo.isASearchByDomain(), searchInfoByDomain = searchInfo.isASearchByDomain(),
MAX_SEARCH_ENTRY max = MAX_SEARCH_ENTRY
)?.let { searchGroup -> )?.let { searchGroup ->
if (searchGroup.numberOfChildEntries > 0) { if (searchGroup.numberOfChildEntries > 0) {
searchWithoutUI = true searchWithoutUI = true

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

@@ -151,7 +151,7 @@ class SearchHelper {
if (searchParameters.searchByDomain) { if (searchParameters.searchByDomain) {
try { try {
stringToCheck.inTheSameDomainAs(word, sameSubDomain = true) stringToCheck.inTheSameDomainAs(word, sameSubDomain = true)
} catch (e: Exception) { } catch (_: Exception) {
false false
} }
} else null } else null
@@ -204,11 +204,19 @@ class SearchHelper {
regex.matches(stringToCheck) regex.matches(stringToCheck)
} else { } else {
specialComparison?.invoke(stringToCheck, searchParameters.searchQuery) specialComparison?.invoke(stringToCheck, searchParameters.searchQuery)
?: stringToCheck.contains( ?: run {
searchParameters.searchQuery, // Search with space separator #175
var searchFound = true
searchParameters.searchQuery.split(" ").forEach { word ->
searchFound = searchFound
&& stringToCheck.contains(
word,
!searchParameters.caseSensitive !searchParameters.caseSensitive
) )
} }
searchFound
}
}
} }
} }
} }