From 6f736d6415663dd72e428dadb58a23c0be7f0eab Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 24 Jul 2019 16:37:24 +0200 Subject: [PATCH] Better index action implementation --- .../keepass/database/element/PwDatabase.kt | 16 +++++++++++-- .../keepass/database/element/PwDatabaseV3.kt | 7 +++--- .../keepass/database/element/PwDatabaseV4.kt | 24 ++++++++++++------- .../keepass/database/file/load/ImporterV4.kt | 4 ++-- .../database/file/save/PwDbV3Output.kt | 10 ++++---- .../database/file/save/PwDbV4Output.kt | 4 ++-- 6 files changed, 40 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt index ea3105e50..765d244ea 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt @@ -45,8 +45,8 @@ abstract class PwDatabase, Entry : PwEntry, Group>() - var entryIndexes = LinkedHashMap, Entry>() + private var groupIndexes = LinkedHashMap, Group>() + private var entryIndexes = LinkedHashMap, Entry>() abstract val version: String @@ -201,6 +201,12 @@ abstract class PwDatabase, Entry : PwEntry Unit) { + for (group in groupIndexes) { + action.invoke(group.value) + } + } + /** * Determine if an id number is already in use * @@ -239,6 +245,12 @@ abstract class PwDatabase, Entry : PwEntry Unit) { + for (entry in entryIndexes) { + action.invoke(entry.value) + } + } + fun isEntryIdUsed(id: PwNodeId<*>): Boolean { return entryIndexes.containsKey(id) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV3.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV3.kt index 45621ca16..742cfeda5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV3.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV3.kt @@ -51,9 +51,9 @@ class PwDatabaseV3 : PwDatabase() { val rootGroups: List get() { val kids = ArrayList() - for ((_, value) in groupIndexes) { - if (value.level == 0) - kids.add(value) + doForEachGroupInIndex { group -> + if (group.level == 0) + kids.add(group) } return kids } @@ -61,7 +61,6 @@ class PwDatabaseV3 : PwDatabase() { override val passwordEncoding: String get() = "ISO-8859-1" - override var numberKeyEncryptionRounds: Long get() = numKeyEncRounds.toLong() @Throws(NumberFormatException::class) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV4.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV4.kt index 50948c683..4d5029c24 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV4.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV4.kt @@ -80,10 +80,8 @@ class PwDatabaseV4 : PwDatabase() { var entryTemplatesGroupChanged = PwDate() var historyMaxItems = DEFAULT_HISTORY_MAX_ITEMS var historyMaxSize = DEFAULT_HISTORY_MAX_SIZE - // TODO last selected group as object - var lastSelectedGroup = UUID_ZERO - // TODO last top visible group as object - var lastTopVisibleGroup = UUID_ZERO + var lastSelectedGroupUUID = UUID_ZERO + var lastTopVisibleGroupUUID = UUID_ZERO var memoryProtection = MemoryProtectionConfig() val deletedObjects = ArrayList() val customIcons = ArrayList() @@ -150,13 +148,21 @@ class PwDatabaseV4 : PwDatabase() { override val passwordEncoding: String get() = "UTF-8" + fun getGroupByUUID(groupUUID: UUID): PwGroupV4? { + if (groupUUID == UUID_ZERO) + return null + return getGroupById(PwNodeIdUUID(groupUUID)) + } + // Retrieve recycle bin in index val recycleBin: PwGroupV4? - get() { - if (recycleBinUUID == UUID_ZERO) - return null - return groupIndexes[PwNodeIdUUID(recycleBinUUID)] - } + get() = getGroupByUUID(recycleBinUUID) + + val lastSelectedGroup: PwGroupV4? + get() = getGroupByUUID(lastSelectedGroupUUID) + + val lastTopVisibleGroup: PwGroupV4? + get() = getGroupByUUID(lastTopVisibleGroupUUID) fun setDataEngine(dataEngine: CipherEngine) { this.dataEngine = dataEngine diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt index 6a2629859..f0002d4d3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt @@ -385,9 +385,9 @@ class ImporterV4(private val streamDir: File) : Importer() { } else if (name.equals(PwDatabaseV4XML.ElemHistoryMaxSize, ignoreCase = true)) { mDatabase.historyMaxSize = readLong(xpp, -1) } else if (name.equals(PwDatabaseV4XML.ElemLastSelectedGroup, ignoreCase = true)) { - mDatabase.lastSelectedGroup = readUuid(xpp) + mDatabase.lastSelectedGroupUUID = readUuid(xpp) } else if (name.equals(PwDatabaseV4XML.ElemLastTopVisibleGroup, ignoreCase = true)) { - mDatabase.lastTopVisibleGroup = readUuid(xpp) + mDatabase.lastTopVisibleGroupUUID = readUuid(xpp) } else if (name.equals(PwDatabaseV4XML.ElemBinaries, ignoreCase = true)) { return switchContext(ctx, KdbContext.Binaries, xpp) } else if (name.equals(PwDatabaseV4XML.ElemCustomData, ignoreCase = true)) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV3Output.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV3Output.kt index 251d0b7eb..c21442fd9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV3Output.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV3Output.kt @@ -204,18 +204,16 @@ class PwDbV3Output(private val mDatabaseV3: PwDatabaseV3, os: OutputStream) : Pw } // Groups - for (group in mDatabaseV3.groupIndexes) { - val pgo = PwGroupOutputV3(group as PwGroupV3, os) + mDatabaseV3.doForEachGroupInIndex { group -> + val pgo = PwGroupOutputV3(group, os) try { pgo.output() } catch (e: IOException) { throw PwDbOutputException("Failed to output a tree", e) } } - - // Entries - for (entry in mDatabaseV3.entryIndexes) { - val peo = PwEntryOutputV3(entry as PwEntryV3, os) + mDatabaseV3.doForEachEntryInIndex { entry -> + val peo = PwEntryOutputV3(entry, os) try { peo.output() } catch (e: IOException) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV4Output.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV4Output.kt index 30ca204d2..515d6351d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV4Output.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/save/PwDbV4Output.kt @@ -218,8 +218,8 @@ class PwDbV4Output(private val mDatabaseV4: PwDatabaseV4, outputStream: OutputSt writeObject(PwDatabaseV4XML.ElemEntryTemplatesGroupChanged, mDatabaseV4.entryTemplatesGroupChanged.date) writeObject(PwDatabaseV4XML.ElemHistoryMaxItems, mDatabaseV4.historyMaxItems.toLong()) writeObject(PwDatabaseV4XML.ElemHistoryMaxSize, mDatabaseV4.historyMaxSize) - writeObject(PwDatabaseV4XML.ElemLastSelectedGroup, mDatabaseV4.lastSelectedGroup) - writeObject(PwDatabaseV4XML.ElemLastTopVisibleGroup, mDatabaseV4.lastTopVisibleGroup) + writeObject(PwDatabaseV4XML.ElemLastSelectedGroup, mDatabaseV4.lastSelectedGroupUUID) + writeObject(PwDatabaseV4XML.ElemLastTopVisibleGroup, mDatabaseV4.lastTopVisibleGroupUUID) if (header!!.version < PwDbHeaderV4.FILE_VERSION_32_4) { writeBinPool()