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

Faster accent replacement method implementation #964

Browse Source
This commit is contained in:
J-Jamet
2021-04-22 10:34:23 +02:00
parent 5b7018f71b
commit d75d13965b
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ import com.kunzisoft.keepass.model.SearchInfo
import com.kunzisoft.keepass.otp.OtpEntryFields.OTP_FIELD
import com.kunzisoft.keepass.settings.PreferencesUtil
import com.kunzisoft.keepass.timeout.TimeoutHelper
import com.kunzisoft.keepass.utils.StringUtil.removeDiacriticalMarks
import com.kunzisoft.keepass.utils.StringUtil.flattenToAscii
class SearchHelper {
@@ -165,9 +165,8 @@ class SearchHelper {
fun checkSearchQuery(stringToCheck: String, searchParameters: SearchParameters): Boolean {
if (stringToCheck.isNotEmpty()
&& stringToCheck
.removeDiacriticalMarks()
.contains(searchParameters.searchQuery
.removeDiacriticalMarks(),
.flattenToAscii()
.contains(searchParameters.searchQuery.flattenToAscii(),
searchParameters.ignoreCase)) {
return true
}

16
app/src/main/java/com/kunzisoft/keepass/utils/StringUtil.kt
View File

@@ -12,9 +12,19 @@ object StringUtil {
return this.replace("[\\r|\\n|\\t|\\s|\\u00A0]+".toRegex(), "")
}
fun String.removeDiacriticalMarks(): String {
return "\\p{InCombiningDiacriticalMarks}+".toRegex()
.replace(Normalizer.normalize(this, Normalizer.Form.NFD), "")
fun String.flattenToAscii(): String {
var string = this
val out = CharArray(string.length)
string = Normalizer.normalize(string, Normalizer.Form.NFD)
var j = 0
var i = 0
val n = string.length
while (i < n) {
val c = string[i]
if (c <= '\u007F') out[j++] = c
++i
}
return String(out)
}
fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }