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: distinct domain names #1105

Browse Source
This commit is contained in:
J-Jamet
2024-11-08 21:11:26 +01:00
parent 4723fb39e9
commit 1c95a0edc4
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
View File

@@ -866,8 +866,8 @@ open class Database {
fun createVirtualGroupFromSearch(
searchParameters: SearchParameters,
fromGroup: NodeId<*>? = null,
max: Int = Integer.MAX_VALUE
fromGroup: NodeId<*>? = null,
max: Int = Integer.MAX_VALUE
): Group? {
return mSearchHelper.createVirtualGroupWithSearchResult(this,
searchParameters, fromGroup, max)

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

@@ -148,7 +148,15 @@ class SearchHelper {
return true
}
if (searchParameters.searchInUrls) {
if (checkSearchQuery(entry.url, searchParameters))
if (checkSearchQuery(entry.url, searchParameters) { stringToCheck, word ->
// domain.org
stringToCheck.equals(word, !searchParameters.caseSensitive) ||
// subdomain.domain.org
stringToCheck.endsWith(".$word", !searchParameters.caseSensitive) ||
// https://domain.org
stringToCheck.endsWith("\\/$word", !searchParameters.caseSensitive)
// Don't allow mydomain.org
})
return true
}
if (searchParameters.searchInNotes) {
@@ -176,7 +184,10 @@ class SearchHelper {
return false
}
private fun checkSearchQuery(stringToCheck: String, searchParameters: SearchParameters): Boolean {
private fun checkSearchQuery(
stringToCheck: String,
searchParameters: SearchParameters,
specialComparison: ((check: String, word: String) -> Boolean)? = null): Boolean {
/*
// TODO Search settings
var removeAccents = true <- Too much time, to study
@@ -196,7 +207,8 @@ class SearchHelper {
var searchFound = true
searchParameters.searchQuery.split(" ").forEach { word ->
searchFound = searchFound
&& stringToCheck.contains(word, !searchParameters.caseSensitive)
&& (specialComparison?.invoke(stringToCheck, word)
?: stringToCheck.contains(word, !searchParameters.caseSensitive))
}
searchFound
}