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

Replace vararg for non-compatible devices

Browse Source
This commit is contained in:
J-Jamet
2020-05-06 18:14:41 +02:00
parent 164fb1f4f5
commit 1e1bd15a06
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -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

5
app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
View File

@@ -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<Node>(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

2
app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
View File

@@ -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)
}

14
app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt
View File

@@ -260,9 +260,9 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
return entriesInfo
}
fun getFilteredChildEntries(vararg filter: ChildFilter): List<Entry> {
val withoutMetaStream = filter.contains(ChildFilter.META_STREAM)
val showExpiredEntries = !filter.contains(ChildFilter.EXPIRED)
fun getFilteredChildEntries(filters: Array<ChildFilter>): List<Entry> {
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<Group, Entry> {
ArrayList()
}
fun getNumberOfChildEntries(vararg filter: ChildFilter): Int {
return getFilteredChildEntries(*filter).size
fun getNumberOfChildEntries(filters: Array<ChildFilter> = emptyArray()): Int {
return getFilteredChildEntries(filters).size
}
/**
@@ -290,8 +290,8 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
return getChildGroups() + getChildEntries()
}
fun getFilteredChildren(vararg filter: ChildFilter): List<Node> {
return getChildGroups() + getFilteredChildEntries(*filter)
fun getFilteredChildren(filters: Array<ChildFilter>): List<Node> {
return getChildGroups() + getFilteredChildEntries(filters)
}
override fun addChildGroup(group: Group) {