mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Rollback ignore accents #945
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
KeePassDX(3.0.0)
|
||||
* Fix search with non-latin chars #971
|
||||
* Fix action mode with search #972
|
||||
* Fix action mode with search #972 (rollback ignore accents #945)
|
||||
|
||||
KeePassDX(2.9.19)
|
||||
* Fix search slowdown #964
|
||||
|
||||
@@ -177,13 +177,13 @@ class SearchHelper {
|
||||
// TODO Search settings
|
||||
var regularExpression = false
|
||||
var ignoreCase = true
|
||||
var removeAccents = true
|
||||
var removeAccents = true <- Too much time, to study
|
||||
var excludeExpired = false
|
||||
var searchOnlyInCurrentGroup = false
|
||||
*/
|
||||
return stringToCheck.isNotEmpty()
|
||||
&& stringToCheck.removeAccents().contains(
|
||||
searchParameters.searchQuery.removeAccents(), true)
|
||||
&& stringToCheck.contains(
|
||||
searchParameters.searchQuery, true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,10 +12,5 @@ object StringUtil {
|
||||
return this.replace("[\\r|\\n|\\t|\\s|\\u00A0]+".toRegex(), "")
|
||||
}
|
||||
|
||||
fun String.removeAccents(): String {
|
||||
return Normalizer.normalize(this, Normalizer.Form.NFD)
|
||||
.replace("\\p{Mn}+".toRegex(), "")
|
||||
}
|
||||
|
||||
fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }
|
||||
}
|
||||
@@ -1,2 +1,2 @@
|
||||
* Fix search with non-latin chars #971
|
||||
* Fix action mode with search #972
|
||||
* Fix action mode with search #972 (rollback ignore accents #945)
|
||||
@@ -1,2 +1,2 @@
|
||||
* Correction de la recherche avec des caractères non latin #971
|
||||
* Correction du mode action avec la recherche #972
|
||||
* Correction du mode action avec la recherche #972 (retour arrière des accents ignorés #945)
|
||||
Reference in New Issue
Block a user