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

fix: Filters

Browse Source
This commit is contained in:
J-Jamet
2024-10-21 19:54:47 +02:00
parent 9fb4754430
commit 0382c05152
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
View File

@@ -115,9 +115,10 @@ class BreadcrumbAdapter(val context: Context, val database: Database?)
holder.groupNumbersView?.apply {
if (mShowNumberEntries) {
text = group.getNumberOfChildEntries(mNodeFilter.recursiveNumberOfEntries) {
mNodeFilter.getFilter(node)
}.toString()
text = group.getNumberOfChildEntries(
mNodeFilter.recursiveNumberOfEntries,
mNodeFilter.filter
).toString()
visibility = View.VISIBLE
} else {
visibility = View.GONE

6
app/src/main/java/com/kunzisoft/keepass/adapters/NodeFilter.kt
View File

@@ -16,8 +16,8 @@ class NodeFilter(
private var showExpired = PreferencesUtil.showExpiredEntries(context)
private var showTemplate = PreferencesUtil.showTemplates(context)
fun getFilter(node: Node): Boolean {
return (when (node) {
val filter: (Node) -> Boolean = { node ->
when (node) {
is Entry -> {
node.entryKDB?.isMetaStream() != true
}
@@ -25,6 +25,6 @@ class NodeFilter(
showTemplate || database?.templatesGroup != node
}
else -> true
}) && (showExpired || !node.isCurrentlyExpires)
} && (showExpired || !node.isCurrentlyExpires)
}
}

11
app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
View File

@@ -175,9 +175,7 @@ class NodesAdapter (
mOldVirtualGroup = mVirtualGroup
mVirtualGroup = group.isVirtual
assignPreferences()
mNodeSortedList.replaceAll(group.getChildren { node ->
mNodeFilters?.getFilter(node) ?: true
})
mNodeSortedList.replaceAll(group.getChildren(mNodeFilter.filter))
}
private inner class NodeSortedListCallback: SortedListAdapterCallback<Node>(this) {
@@ -474,9 +472,10 @@ class NodesAdapter (
if (mShowNumberEntries) {
holder.numberChildren?.apply {
text = (subNode as Group)
.getNumberOfChildEntries(mNodeFilter.recursiveNumberOfEntries) {
mNodeFilter.getFilter(subNode)
}
.getNumberOfChildEntries(
mNodeFilter.recursiveNumberOfEntries,
mNodeFilter.filter
)
.toString()
setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
visibility = View.VISIBLE