diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index b55c1e5dd..df73f8bbe 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -453,7 +453,7 @@ class GroupActivity : LockingActivity(), private fun refreshNumberOfChildren() { numberChildrenView?.apply { if (PreferencesUtil.showNumberEntries(context)) { - text = mCurrentGroup?.getNumberOfChildEntries(*Group.ChildFilter.getDefaults(context))?.toString() ?: "" + text = mCurrentGroup?.getNumberOfChildEntries(Group.ChildFilter.getDefaults(context))?.toString() ?: "" visibility = View.VISIBLE } else { visibility = View.GONE 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 45d52f480..89d604290 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt @@ -133,8 +133,7 @@ class NodeAdapter (private val context: Context) */ fun rebuildList(group: Group) { assignPreferences() - nodeSortedList.replaceAll(group.getFilteredChildren(*entryFilters) - ) + nodeSortedList.replaceAll(group.getFilteredChildren(entryFilters)) } private inner class NodeSortedListCallback: SortedListAdapterCallback(this) { @@ -331,7 +330,7 @@ class NodeAdapter (private val context: Context) if (showNumberEntries) { holder.numberChildren?.apply { text = (subNode as Group) - .getNumberOfChildEntries(*entryFilters) + .getNumberOfChildEntries(entryFilters) .toString() setTextSize(textSizeUnit, numberChildrenTextDefaultDimension, prefSizeMultiplier) visibility = View.VISIBLE diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt index e04a024fe..a79e1b928 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt @@ -132,7 +132,7 @@ class SearchEntryCursorAdapter(private val context: Context, val searchGroup = database.createVirtualGroupFromSearch(query, SearchHelper.MAX_SEARCH_ENTRY) if (searchGroup != null) { // Search in hide entries but not meta-stream - for (entry in searchGroup.getFilteredChildEntries(*Group.ChildFilter.getDefaults(context))) { + for (entry in searchGroup.getFilteredChildEntries(Group.ChildFilter.getDefaults(context))) { entry.entryKDB?.let { cursorKDB?.addEntry(it) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt index 8606b19f6..73ec4a35b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt @@ -260,9 +260,9 @@ class Group : Node, GroupVersionedInterface { return entriesInfo } - fun getFilteredChildEntries(vararg filter: ChildFilter): List { - val withoutMetaStream = filter.contains(ChildFilter.META_STREAM) - val showExpiredEntries = !filter.contains(ChildFilter.EXPIRED) + fun getFilteredChildEntries(filters: Array): List { + val withoutMetaStream = filters.contains(ChildFilter.META_STREAM) + val showExpiredEntries = !filters.contains(ChildFilter.EXPIRED) return groupKDB?.getChildEntries()?.filter { (!withoutMetaStream || (withoutMetaStream && !it.isMetaStream)) @@ -278,8 +278,8 @@ class Group : Node, GroupVersionedInterface { ArrayList() } - fun getNumberOfChildEntries(vararg filter: ChildFilter): Int { - return getFilteredChildEntries(*filter).size + fun getNumberOfChildEntries(filters: Array = emptyArray()): Int { + return getFilteredChildEntries(filters).size } /** @@ -290,8 +290,8 @@ class Group : Node, GroupVersionedInterface { return getChildGroups() + getChildEntries() } - fun getFilteredChildren(vararg filter: ChildFilter): List { - return getChildGroups() + getFilteredChildEntries(*filter) + fun getFilteredChildren(filters: Array): List { + return getChildGroups() + getFilteredChildEntries(filters) } override fun addChildGroup(group: Group) {