diff --git a/CHANGELOG b/CHANGELOG index 3e2fce179..a4139cfb0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt index 5aeca0eab..b1859a196 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt @@ -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) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/StringUtil.kt b/app/src/main/java/com/kunzisoft/keepass/utils/StringUtil.kt index 7276ebfd3..5ef84cefc 100644 --- a/app/src/main/java/com/kunzisoft/keepass/utils/StringUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/utils/StringUtil.kt @@ -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) } } \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/74.txt b/fastlane/metadata/android/en-US/changelogs/74.txt index a884ff434..4a8fefba2 100644 --- a/fastlane/metadata/android/en-US/changelogs/74.txt +++ b/fastlane/metadata/android/en-US/changelogs/74.txt @@ -1,2 +1,2 @@ * Fix search with non-latin chars #971 - * Fix action mode with search #972 \ No newline at end of file + * Fix action mode with search #972 (rollback ignore accents #945) \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/74.txt b/fastlane/metadata/android/fr-FR/changelogs/74.txt index 0e9b979d3..4f1a6a055 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/74.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/74.txt @@ -1,2 +1,2 @@ * Correction de la recherche avec des caractères non latin #971 - * Correction du mode action avec la recherche #972 \ No newline at end of file + * Correction du mode action avec la recherche #972 (retour arrière des accents ignorés #945) \ No newline at end of file