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 tag filter

Browse Source
This commit is contained in:
J-Jamet
2022-02-05 14:34:10 +01:00
parent 7697713c44
commit 69fbfd7723
4 changed files with 7 additions and 3 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

@@ -666,7 +666,7 @@ class GroupActivity : DatabaseLockActivity(),
searchFiltersView?.setNumbers(group.numberOfChildEntries) searchFiltersView?.setNumbers(group.numberOfChildEntries)
searchFiltersView?.setCurrentGroupText(mMainGroup?.title ?: "") searchFiltersView?.setCurrentGroupText(mMainGroup?.title ?: "")
searchFiltersView?.enableOther(mDatabase?.allowEntryCustomFields() ?: false) searchFiltersView?.enableOther(mDatabase?.allowEntryCustomFields() ?: false)
searchFiltersView?.enableTags(mDatabase?.tagPool?.isEmpty() ?: false) searchFiltersView?.enableTags(mDatabase?.tagPool?.isNotEmpty() ?: false)
searchFiltersView?.enableTemplates(mDatabase?.templatesGroup != null) searchFiltersView?.enableTemplates(mDatabase?.templatesGroup != null)
toolbarBreadcrumb?.navigationIcon = null toolbarBreadcrumb?.navigationIcon = null
} else { } else {

4
app/src/main/java/com/kunzisoft/keepass/database/element/Tags.kt
View File

@@ -53,6 +53,10 @@ class Tags: Parcelable {
return mTags.isEmpty() return mTags.isEmpty()
} }
fun isNotEmpty(): Boolean {
return !isEmpty()
}
fun size(): Int { fun size(): Int {
return mTags.size return mTags.size
} }

2
app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt
View File

@@ -224,7 +224,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
private inner class GroupOperationHandler: NodeOperationHandler<GroupKDBX>() { private inner class GroupOperationHandler: NodeOperationHandler<GroupKDBX>() {
var containsTags = false var containsTags = false
override fun operate(node: GroupKDBX): Boolean { override fun operate(node: GroupKDBX): Boolean {
if (!node.tags.isEmpty()) if (node.tags.isNotEmpty())
containsTags = true containsTags = true
return super.operate(node) return super.operate(node)
} }

2
app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt
View File

@@ -663,7 +663,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
@Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class) @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
private fun writeTags(tags: Tags) { private fun writeTags(tags: Tags) {
if (!tags.isEmpty()) { if (tags.isNotEmpty()) {
writeString(DatabaseKDBXXML.ElemTags, tags.toString()) writeString(DatabaseKDBXXML.ElemTags, tags.toString())
} }
} }