diff --git a/CHANGELOG b/CHANGELOG index cb39b64e0..6f468d440 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ KeepassDX (2.5.0.0beta20) * Fix nested groups no longer visible in V1 databases + * Add natural database sort KeepassDX (2.5.0.0beta20) * Fix a major bug that displays an entry history diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt index 3053fe500..496d52b2c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt @@ -30,7 +30,6 @@ import android.widget.ImageView import android.widget.TextView import android.widget.Toast import com.kunzisoft.keepass.R -import com.kunzisoft.keepass.app.App import com.kunzisoft.keepass.database.SortNodeEnum import com.kunzisoft.keepass.database.element.* import com.kunzisoft.keepass.icons.assignDatabaseIcon @@ -138,7 +137,7 @@ class NodeAdapter assignPreferences() // TODO verify sort try { - this.nodeSortedList.addAll(group.getChildrenWithoutMetaStream()) + this.nodeSortedList.addAll(group.getChildren()) } catch (e: Exception) { Log.e(TAG, "Can't add node elements to the list", e) Toast.makeText(context, "Can't add node elements to the list : " + e.message, Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.kt b/app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.kt index 22a6b2415..e579df22e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.kt @@ -31,7 +31,7 @@ enum class SortNodeEnum { fun getNodeComparator(ascending: Boolean, groupsBefore: Boolean): Comparator { return when (this) { - DB -> NodeCreationComparator(ascending, groupsBefore) // TODO Sort + DB -> NodeNaturalComparator(ascending, groupsBefore) TITLE -> NodeTitleComparator(ascending, groupsBefore) USERNAME -> NodeCreationComparator(ascending, groupsBefore) // TODO Sort CREATION_TIME -> NodeCreationComparator(ascending, groupsBefore) @@ -40,7 +40,7 @@ enum class SortNodeEnum { } } - abstract class NodeComparator internal constructor(internal var ascending: Boolean, private var groupsBefore: Boolean) : Comparator { + abstract class NodeComparator(internal var ascending: Boolean, private var groupsBefore: Boolean) : Comparator { internal fun compareWith(comparatorGroup: Comparator, comparatorEntry: Comparator, @@ -81,10 +81,27 @@ enum class SortNodeEnum { } } + /** + * Comparator of node by natural database placement + */ + class NodeNaturalComparator(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { + + override fun compare(object1: NodeVersioned, object2: NodeVersioned): Int { + + return compareWith( + GroupNaturalOrderComparator(ascending), + EntryNaturalOrderComparator(ascending), + object1, + object2, + object1.creationTime.date + ?.compareTo(object2.creationTime.date) ?: 0) + } + } + /** * Comparator of Node by Title, Groups first, Entries second */ - class NodeTitleComparator internal constructor(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { + class NodeTitleComparator(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { override fun compare(object1: NodeVersioned, object2: NodeVersioned): Int { @@ -101,7 +118,7 @@ enum class SortNodeEnum { /** * Comparator of node by creation, Groups first, Entries second */ - class NodeCreationComparator internal constructor(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { + class NodeCreationComparator(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { override fun compare(object1: NodeVersioned, object2: NodeVersioned): Int { @@ -118,7 +135,7 @@ enum class SortNodeEnum { /** * Comparator of node by last modification, Groups first, Entries second */ - class NodeLastModificationComparator internal constructor(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { + class NodeLastModificationComparator(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { override fun compare(object1: NodeVersioned, object2: NodeVersioned): Int { @@ -135,7 +152,7 @@ enum class SortNodeEnum { /** * Comparator of node by last access, Groups first, Entries second */ - class NodeLastAccessComparator internal constructor(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { + class NodeLastAccessComparator(ascending: Boolean, groupsBefore: Boolean) : NodeComparator(ascending, groupsBefore) { override fun compare(object1: NodeVersioned, object2: NodeVersioned): Int { @@ -149,162 +166,119 @@ enum class SortNodeEnum { } } - abstract class AscendingComparator internal constructor(private val ascending: Boolean) : Comparator { + abstract class AscendingComparator(private val ascending: Boolean) : Comparator { - internal fun compareWithAscending(basicCompareResult: Int): Int { + private fun compareWithAscending(specificOrderComp: Int): Int { // If descending, revert - return if (!ascending) -basicCompareResult else basicCompareResult - + return if (!ascending) -specificOrderComp else specificOrderComp } - } - /** - * Group comparator by name - */ - class GroupNameComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { + abstract fun compareBySecificOrder(object1: Node, object2: Node): Int - override fun compare(object1: GroupVersioned, object2: GroupVersioned): Int { + override fun compare(object1: Node, object2: Node): Int { if (object1 == object2) return 0 - val groupNameComp = object1.title.compareTo(object2.title, ignoreCase = true) - // If same name, can be different - return if (groupNameComp == 0) { + val specificOrderComp = compareBySecificOrder(object1, object2) + return if (specificOrderComp == 0) { object1.hashCode() - object2.hashCode() - } else compareWithAscending(groupNameComp) + } else compareWithAscending(specificOrderComp) + } + } + /** + * Group comparator by natural order + */ + class GroupNaturalOrderComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: GroupVersioned, object2: GroupVersioned): Int { + return object1.nodePositionInParent.compareTo(object2.nodePositionInParent) } } /** * Group comparator by name */ - class GroupCreationComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { + class GroupNameComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: GroupVersioned, object2: GroupVersioned): Int { + return object1.title.compareTo(object2.title, ignoreCase = true) + } + } - override fun compare(object1: GroupVersioned, object2: GroupVersioned): Int { - if (object1 == object2) - return 0 - - val groupCreationComp = object1.creationTime.date + /** + * Group comparator by name + */ + class GroupCreationComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: GroupVersioned, object2: GroupVersioned): Int { + return object1.creationTime.date ?.compareTo(object2.creationTime.date) ?: 0 - // If same creation, can be different - return if (groupCreationComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(groupCreationComp) - } } /** * Group comparator by last modification */ - class GroupLastModificationComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { - - override fun compare(object1: GroupVersioned, object2: GroupVersioned): Int { - if (object1 == object2) - return 0 - - val groupLastModificationComp = object1.lastModificationTime.date + class GroupLastModificationComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: GroupVersioned, object2: GroupVersioned): Int { + return object1.lastModificationTime.date ?.compareTo(object2.lastModificationTime.date) ?: 0 - // If same creation, can be different - return if (groupLastModificationComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(groupLastModificationComp) - } } /** * Group comparator by last access */ - class GroupLastAccessComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { - - override fun compare(object1: GroupVersioned, object2: GroupVersioned): Int { - if (object1 == object2) - return 0 - - val groupLastAccessComp = object1.lastAccessTime.date + class GroupLastAccessComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: GroupVersioned, object2: GroupVersioned): Int { + return object1.lastAccessTime.date ?.compareTo(object2.lastAccessTime.date) ?: 0 - // If same creation, can be different - return if (groupLastAccessComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(groupLastAccessComp) - } } /** * Comparator of Entry by Name */ - class EntryNameComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { - - override fun compare(object1: EntryVersioned, object2: EntryVersioned): Int { - if (object1 == object2) - return 0 - - val entryTitleComp = object1.title.compareTo(object2.title, ignoreCase = true) - // If same title, can be different - return if (entryTitleComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(entryTitleComp) + class EntryNaturalOrderComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: EntryVersioned, object2: EntryVersioned): Int { + return object1.nodePositionInParent.compareTo(object2.nodePositionInParent) + } + } + /** + * Comparator of Entry by Name + */ + class EntryNameComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: EntryVersioned, object2: EntryVersioned): Int { + return object1.title.compareTo(object2.title, ignoreCase = true) } } /** * Comparator of Entry by Creation */ - class EntryCreationComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { - - override fun compare(object1: EntryVersioned, object2: EntryVersioned): Int { - if (object1 == object2) - return 0 - - val entryCreationComp = object1.creationTime.date + class EntryCreationComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: EntryVersioned, object2: EntryVersioned): Int { + return object1.creationTime.date ?.compareTo(object2.creationTime.date) ?: 0 - // If same creation, can be different - return if (entryCreationComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(entryCreationComp) - } } /** * Comparator of Entry by Last Modification */ - class EntryLastModificationComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { - - override fun compare(object1: EntryVersioned, object2: EntryVersioned): Int { - if (object1 == object2) - return 0 - - val entryLastModificationComp = object1.lastModificationTime.date + class EntryLastModificationComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: EntryVersioned, object2: EntryVersioned): Int { + return object1.lastModificationTime.date ?.compareTo(object2.lastModificationTime.date) ?: 0 - // If same creation, can be different - return if (entryLastModificationComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(entryLastModificationComp) - } } /** * Comparator of Entry by Last Access */ - class EntryLastAccessComparator internal constructor(ascending: Boolean) : AscendingComparator(ascending) { - - override fun compare(object1: EntryVersioned, object2: EntryVersioned): Int { - if (object1 == object2) - return 0 - - val entryLastAccessComp = object1.lastAccessTime.date + class EntryLastAccessComparator(ascending: Boolean) : AscendingComparator(ascending) { + override fun compareBySecificOrder(object1: EntryVersioned, object2: EntryVersioned): Int { + return object1.lastAccessTime.date ?.compareTo(object2.lastAccessTime.date) ?: 0 - // If same creation, can be different - return if (entryLastAccessComp == 0) { - object1.hashCode() - object2.hashCode() - } else compareWithAscending(entryLastAccessComp) - } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt index 8ee77d8f5..22c179e43 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt @@ -195,12 +195,15 @@ class GroupVersioned : NodeVersioned, PwGroupInterface { + fun getChildren(withoutMetaStream: Boolean = true): List { val children = ArrayList() children.addAll(getChildGroups()) pwGroupV3?.let { - children.addAll(getChildEntries().filter { !it.isMetaStream }) + if (withoutMetaStream) + children.addAll(getChildEntries().filter { !it.isMetaStream }) + else + children.addAll(getChildEntries()) } pwGroupV4?.let { // No MetasStream in V4 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/NodeVersioned.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/NodeVersioned.kt index c0de233e9..44a3746dc 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/NodeVersioned.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/NodeVersioned.kt @@ -1,6 +1,18 @@ package com.kunzisoft.keepass.database.element -interface NodeVersioned: PwNodeInterface +interface NodeVersioned: PwNodeInterface { + + val nodePositionInParent: Int + get() { + parent?.getChildren(false)?.let { children -> + for ((i, child) in children.withIndex()) { + if (child == this) + return i + } + } + return -1 + } +} /** * Type of available Nodes diff --git a/app/src/main/res/layout/fragment_sort_selection.xml b/app/src/main/res/layout/fragment_sort_selection.xml index 0c4326f0d..6dd0fe837 100644 --- a/app/src/main/res/layout/fragment_sort_selection.xml +++ b/app/src/main/res/layout/fragment_sort_selection.xml @@ -15,8 +15,7 @@ + android:text="@string/sort_db"/>