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

Merge branch 'develop' into feature/Database_Call

Browse Source
This commit is contained in:
J-Jamet
2021-04-29 17:54:23 +02:00
parent b5ba03df4d cb59cef1b8
commit c87696696e
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -1,6 +1,6 @@
KeePassDX(3.0.0) KeePassDX(3.0.0)
* Fix search with non-latin chars #971 * 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) KeePassDX(2.9.19)
* Fix search slowdown #964 * Fix search slowdown #964

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

@@ -29,7 +29,6 @@ import com.kunzisoft.keepass.model.SearchInfo
import com.kunzisoft.keepass.otp.OtpEntryFields.OTP_FIELD import com.kunzisoft.keepass.otp.OtpEntryFields.OTP_FIELD
import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.settings.PreferencesUtil
import com.kunzisoft.keepass.timeout.TimeoutHelper import com.kunzisoft.keepass.timeout.TimeoutHelper
import com.kunzisoft.keepass.utils.StringUtil.removeAccents
import com.kunzisoft.keepass.utils.UuidUtil import com.kunzisoft.keepass.utils.UuidUtil
class SearchHelper { class SearchHelper {
@@ -177,13 +176,13 @@ class SearchHelper {
// TODO Search settings // TODO Search settings
var regularExpression = false var regularExpression = false
var ignoreCase = true var ignoreCase = true
var removeAccents = true var removeAccents = true <- Too much time, to study
var excludeExpired = false var excludeExpired = false
var searchOnlyInCurrentGroup = false var searchOnlyInCurrentGroup = false
*/ */
return stringToCheck.isNotEmpty() return stringToCheck.isNotEmpty()
&& stringToCheck.removeAccents().contains( && stringToCheck.contains(
searchParameters.searchQuery.removeAccents(), true) searchParameters.searchQuery, true)
} }
} }
} }

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

@@ -12,10 +12,5 @@ object StringUtil {
return this.replace("[\\r|\\n|\\t|\\s|\\u00A0]+".toRegex(), "") 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) } fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }
} }

2
fastlane/metadata/android/en-US/changelogs/74.txt
View File

@@ -1,2 +1,2 @@
* Fix search with non-latin chars #971 * Fix search with non-latin chars #971
* Fix action mode with search #972 * Fix action mode with search #972 (rollback ignore accents #945)

2
fastlane/metadata/android/fr-FR/changelogs/74.txt
View File

@@ -1,2 +1,2 @@
* Correction de la recherche avec des caractères non latin #971 * 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)