From e164062cf3e78fbb2c4d9cc706b54558a36c7c81 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 13 Aug 2019 13:27:09 +0200 Subject: [PATCH] Remove menu in selection mode --- .../keepass/activities/ListNodesFragment.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt index 30e73c5ff..b234fec63 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt @@ -21,6 +21,7 @@ import com.kunzisoft.keepass.database.SortNodeEnum import com.kunzisoft.keepass.database.element.GroupVersioned import com.kunzisoft.keepass.database.element.NodeVersioned import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment +import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.activities.stylish.StylishFragment import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper @@ -43,6 +44,10 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis private var prefs: SharedPreferences? = null private var readOnly: Boolean = false + get() { + return field || selectionMode + } + private var selectionMode: Boolean = false val isEmpty: Boolean get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0 @@ -139,6 +144,17 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis override fun onResume() { super.onResume() + activity?.intent?.let { + selectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(it) + } + // Force read only mode if selection mode + mAdapter?.apply { + setReadOnly(readOnly) + } + + // Refresh data + mAdapter?.notifyDataSetChanged() + if (isASearchResult && mAdapter!= null && mAdapter!!.isEmpty) { // To show the " no search entry found " listView?.visibility = View.GONE