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 action in breadcrumb

Browse Source
This commit is contained in:
J-Jamet
2022-01-03 19:51:59 +01:00
parent b3c46348a1
commit 15a28e7c83
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,27 +164,30 @@ class GroupActivity : DatabaseLockActivity(),
mBreadcrumbAdapter = BreadcrumbAdapter(this).apply { mBreadcrumbAdapter = BreadcrumbAdapter(this).apply {
// Open group on breadcrumb click // Open group on breadcrumb click
onItemClickListener = { node, _ -> onItemClickListener = { node, _ ->
finishNodeAction()
// If last item & not a virtual root group // If last item & not a virtual root group
val currentGroup = mCurrentGroup val currentGroup = mCurrentGroup
if (currentGroup != null && node == currentGroup if (currentGroup != null && node == currentGroup
&& (currentGroup != mDatabase?.rootGroup && (currentGroup != mDatabase?.rootGroup
|| mDatabase?.rootGroupIsVirtual == false) || mDatabase?.rootGroupIsVirtual == false)
) { ) {
finishNodeAction()
launchDialogToShowGroupInfo(currentGroup) launchDialogToShowGroupInfo(currentGroup)
} else { } else {
if (mNodesFragment?.nodeActionSelectionMode == true) {
finishNodeAction()
}
mDatabase?.let { database -> mDatabase?.let { database ->
onNodeClick(database, node) onNodeClick(database, node)
} }
} }
} }
onLongItemClickListener = { node, position -> onLongItemClickListener = { node, position ->
finishNodeAction()
val currentGroup = mCurrentGroup val currentGroup = mCurrentGroup
if (currentGroup != null && node == currentGroup if (currentGroup != null && node == currentGroup
&& (currentGroup != mDatabase?.rootGroup && (currentGroup != mDatabase?.rootGroup
|| mDatabase?.rootGroupIsVirtual == false) || mDatabase?.rootGroupIsVirtual == false)
) { ) {
finishNodeAction()
launchDialogForGroupUpdate(currentGroup) launchDialogForGroupUpdate(currentGroup)
} else { } else {
onItemClickListener?.invoke(node, position) onItemClickListener?.invoke(node, position)