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

First pass load entry refactoring

Browse Source
This commit is contained in:
J-Jamet
2021-06-15 20:03:01 +02:00
parent 358b701396
commit fbf2006e3f
6 changed files with 147 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -572,10 +572,20 @@ class EntryEditActivity : LockingActivity(),
fun performedNextEducation(entryEditActivityEducation: EntryEditActivityEducation) {
val generatePasswordEductionPerformed = (supportFragmentManager.findFragmentById(R.id.entry_edit_content)
as? EntryEditFragment?)?.getGeneratePasswordEductionPerformed(entryEditActivityEducation) {
performedNextEducation(entryEditActivityEducation)
} ?: false
val entryEditFragment = supportFragmentManager.findFragmentById(R.id.entry_edit_content)
as? EntryEditFragment?
val generatePasswordView = entryEditFragment?.getActionImageView()
val generatePasswordEductionPerformed = generatePasswordView != null
&& entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
generatePasswordView,
{
entryEditFragment.launchGeneratePasswordEductionAction()
},
{
performedNextEducation(entryEditActivityEducation)
}
)
if (!generatePasswordEductionPerformed) {
val addNewFieldView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_field)
val addNewFieldEducationPerformed = mDatabase?.allowEntryCustomFields() == true