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 add button listeners

Browse Source
This commit is contained in:
J-Jamet
2022-01-31 14:23:46 +01:00
parent 25c845c1c7
commit 518375e29a
1 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,74 +294,6 @@ class GroupActivity : DatabaseLockActivity(),
// Update last access time. // Update last access time.
currentGroup.touch(modified = false, touchParents = false) currentGroup.touch(modified = false, touchParents = false)
// Add listeners to the add buttons
addNodeButtonView?.setAddGroupClickListener {
launchDialogForGroupCreation(currentGroup)
}
addNodeButtonView?.setAddEntryClickListener {
mDatabase?.let { database ->
EntrySelectionHelper.doSpecialAction(intent,
{
mCurrentGroup?.nodeId?.let { currentParentGroupId ->
mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
EntryEditActivity.launchToCreate(
this@GroupActivity,
database,
currentParentGroupId,
resultLauncher
)
}
}
},
{
// Search not used
},
{ searchInfo ->
EntryEditActivity.launchToCreateForSave(
this@GroupActivity,
database,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
},
{ searchInfo ->
EntryEditActivity.launchForKeyboardSelectionResult(
this@GroupActivity,
database,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
},
{ searchInfo, autofillComponent ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
EntryEditActivity.launchForAutofillResult(
this@GroupActivity,
database,
mAutofillActivityResultLauncher,
autofillComponent,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
} else {
onCancelSpecialMode()
}
},
{ searchInfo ->
EntryEditActivity.launchToCreateForRegistration(
this@GroupActivity,
database,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
}
)
}
}
} else { } else {
mSearchGroup = currentGroup mSearchGroup = currentGroup
} }
@@ -410,6 +342,78 @@ class GroupActivity : DatabaseLockActivity(),
} }
} }
} }
// Add listeners to the add buttons
addNodeButtonView?.setAddGroupClickListener {
mCurrentGroup?.let { currentGroup ->
launchDialogForGroupCreation(currentGroup)
}
}
addNodeButtonView?.setAddEntryClickListener {
mDatabase?.let { database ->
mCurrentGroup?.let { currentGroup ->
EntrySelectionHelper.doSpecialAction(intent,
{
mCurrentGroup?.nodeId?.let { currentParentGroupId ->
mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
EntryEditActivity.launchToCreate(
this@GroupActivity,
database,
currentParentGroupId,
resultLauncher
)
}
}
},
{
// Search not used
},
{ searchInfo ->
EntryEditActivity.launchToCreateForSave(
this@GroupActivity,
database,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
},
{ searchInfo ->
EntryEditActivity.launchForKeyboardSelectionResult(
this@GroupActivity,
database,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
},
{ searchInfo, autofillComponent ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
EntryEditActivity.launchForAutofillResult(
this@GroupActivity,
database,
mAutofillActivityResultLauncher,
autofillComponent,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
} else {
onCancelSpecialMode()
}
},
{ searchInfo ->
EntryEditActivity.launchToCreateForRegistration(
this@GroupActivity,
database,
currentGroup.nodeId,
searchInfo
)
onLaunchActivitySpecialMode()
}
)
}
}
}
} }
override fun viewToInvalidateTimeout(): View? { override fun viewToInvalidateTimeout(): View? {
@@ -417,7 +421,6 @@ class GroupActivity : DatabaseLockActivity(),
} }
private fun loadGroup(database: Database?) { private fun loadGroup(database: Database?) {
loadingView?.showByFading()
when { when {
Intent.ACTION_SEARCH == intent.action -> { Intent.ACTION_SEARCH == intent.action -> {
finishNodeAction() finishNodeAction()