mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Fix search fields references #987
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
KeePassDX(2.10.2)
|
||||
*
|
||||
* Fix search fields references #987
|
||||
|
||||
KeePassDX(2.10.1)
|
||||
* Fix parcelable with custom data #986
|
||||
|
||||
@@ -22,13 +22,13 @@ package com.kunzisoft.keepass.database.element.entry
|
||||
import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
|
||||
import com.kunzisoft.keepass.database.element.node.NodeIdUUID
|
||||
import com.kunzisoft.keepass.utils.UuidUtil
|
||||
import java.util.*
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
|
||||
class FieldReferencesEngine(private val mDatabase: DatabaseKDBX) {
|
||||
|
||||
// Key : <WantedField>@<SearchIn>:<Text>
|
||||
// Value : content
|
||||
private var refsCache: MutableMap<String, String?> = HashMap()
|
||||
private var refsCache = ConcurrentHashMap<String, String?>()
|
||||
|
||||
fun clear() {
|
||||
refsCache.clear()
|
||||
@@ -91,9 +91,9 @@ class FieldReferencesEngine(private val mDatabase: DatabaseKDBX) {
|
||||
|
||||
private fun fillReferencesUsingCache(text: String): String {
|
||||
var newText = text
|
||||
for ((key, value) in refsCache) {
|
||||
refsCache.keys.forEach { key ->
|
||||
// Replace by key if value not found
|
||||
newText = newText.replace(key, value ?: key, true)
|
||||
newText = newText.replace(key, refsCache[key] ?: key, true)
|
||||
}
|
||||
return newText
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
* Fix fields references #987
|
||||
* Fix search fields references #987
|
||||
@@ -1 +1 @@
|
||||
* Correction des références de champs #987
|
||||
* Correction de la recherche des références de champs #987
|
||||
Reference in New Issue
Block a user