From 2ad385acb6277fb4e920ebf3405b7ece384ee8f6 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 8 Feb 2022 14:11:24 +0100 Subject: [PATCH] Fix search filters depending on database version --- .../keepass/activities/GroupActivity.kt | 6 ++++-- .../keepass/database/element/Database.kt | 2 +- .../kunzisoft/keepass/database/element/Group.kt | 2 +- .../keepass/database/search/SearchHelper.kt | 11 +++++++---- .../settings/NestedDatabaseSettingsFragment.kt | 2 +- ...platesGroupPreferenceDialogFragmentCompat.kt | 2 +- .../kunzisoft/keepass/view/SearchFiltersView.kt | 17 +++++++++++++---- 7 files changed, 28 insertions(+), 14 deletions(-) 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 23351f5d6..edf58593b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -664,9 +664,11 @@ class GroupActivity : DatabaseLockActivity(), if (group?.isVirtual == true) { searchFiltersView?.setNumbers(group.numberOfChildEntries) searchFiltersView?.setCurrentGroupText(mMainGroup?.title ?: "") - searchFiltersView?.enableOther(mDatabase?.allowEntryCustomFields() ?: false) + searchFiltersView?.availableOther(mDatabase?.allowEntryCustomFields() ?: false) + searchFiltersView?.availableTags(mDatabase?.allowTags() ?: false) searchFiltersView?.enableTags(mDatabase?.tagPool?.isNotEmpty() ?: false) - searchFiltersView?.enableSearchableGroup(mDatabase?.allowCustomSearchableGroup() ?: false) + searchFiltersView?.availableSearchableGroup(mDatabase?.allowCustomSearchableGroup() ?: false) + searchFiltersView?.availableTemplates(mDatabase?.allowTemplatesGroup ?: false) searchFiltersView?.enableTemplates(mDatabase?.templatesGroup != null) toolbarBreadcrumb?.navigationIcon = null } else { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt index 8d705a3f3..0c7034c52 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt @@ -495,7 +495,7 @@ class Database { * Determine if a configurable templates group is available or not for this version of database * @return true if a configurable templates group available */ - val allowConfigurableTemplatesGroup: Boolean + val allowTemplatesGroup: Boolean get() = mDatabaseKDBX != null // Maybe another templates method with KDBX5 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 f890162b8..a51c63e7e 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 @@ -435,7 +435,7 @@ class Group : Node, GroupVersionedInterface { } var searchable: Boolean? - get() = if (groupKDB != null) true else groupKDBX?.enableSearching + get() = groupKDBX?.enableSearching set(value) { groupKDBX?.enableSearching = value } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt index 6464ae786..38a04922a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt @@ -47,6 +47,7 @@ class SearchHelper { // Search all entries incrementEntry = 0 + val allowSearchable = database.allowCustomSearchableGroup() val startGroup = if (searchParameters.searchInCurrentGroup && fromGroup != null) { database.getGroupById(fromGroup) ?: database.rootGroup } else { @@ -69,12 +70,14 @@ class SearchHelper { }, object : NodeHandler() { override fun operate(node: Group): Boolean { + val inRecycleBin = database.groupIsInRecycleBin(node) + val inTemplates = database.groupIsInTemplates(node) return when { incrementEntry >= max -> false - searchParameters.searchInRecycleBin -> database.groupIsInRecycleBin(node) - searchParameters.searchInTemplates -> database.groupIsInTemplates(node) - searchParameters.searchInSearchableGroup -> node.isSearchable() - else -> true + searchParameters.searchInRecycleBin -> inRecycleBin + searchParameters.searchInTemplates -> inTemplates + (allowSearchable && searchParameters.searchInSearchableGroup) -> node.isSearchable() + else -> !inRecycleBin && !inTemplates } } }, diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt index c55a727f3..c77b4827c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt @@ -238,7 +238,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev // Templates val templatesGroupPrefCategory: PreferenceCategory? = findPreference(getString(R.string.database_category_templates_key)) templatesGroupPref = findPreference(getString(R.string.templates_group_uuid_key)) - if (database.allowConfigurableTemplatesGroup) { + if (database.allowTemplatesGroup) { val templatesEnablePref: SwitchPreference? = findPreference(getString(R.string.templates_group_enable_key)) templatesEnablePref?.apply { isChecked = database.isTemplatesEnabled diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseTemplatesGroupPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseTemplatesGroupPreferenceDialogFragmentCompat.kt index fa4200fea..4349e92d3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseTemplatesGroupPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseTemplatesGroupPreferenceDialogFragmentCompat.kt @@ -64,7 +64,7 @@ class DatabaseTemplatesGroupPreferenceDialogFragmentCompat super.onDialogClosed(database, positiveResult) if (positiveResult) { database?.let { - if (database.allowConfigurableTemplatesGroup) { + if (database.allowTemplatesGroup) { val oldGroup = database.templatesGroup val newGroup = mGroupTemplates database.setTemplatesGroup(newGroup) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt b/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt index 722094d20..271971d35 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt @@ -9,6 +9,7 @@ import android.widget.CompoundButton import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView +import androidx.core.view.isVisible import com.kunzisoft.keepass.R import com.kunzisoft.keepass.database.search.SearchHelper import com.kunzisoft.keepass.database.search.SearchParameters @@ -199,16 +200,24 @@ class SearchFiltersView @JvmOverloads constructor(context: Context, } } - fun enableOther(enable: Boolean) { - searchOther.isEnabled = enable + fun availableOther(available: Boolean) { + searchOther.isVisible = available + } + + fun availableTags(available: Boolean) { + searchTag.isVisible = available } fun enableTags(enable: Boolean) { searchTag.isEnabled = enable } - fun enableSearchableGroup(enable: Boolean) { - searchGroupSearchable.isEnabled = enable + fun availableSearchableGroup(available: Boolean) { + searchGroupSearchable.isVisible = available + } + + fun availableTemplates(available: Boolean) { + searchTemplate.isVisible = available } fun enableTemplates(enable: Boolean) {