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 validate entry education

Browse Source
This commit is contained in:
J-Jamet
2023-07-28 12:59:20 +02:00
parent 16f92fc895
commit b913913bf1
5 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,7 @@ class EntryEditActivity : DatabaseLockActivity(),
// Lock button
lockView?.setOnClickListener { lockAndExit() }
// Save button
validateButton?.setOnClickListener { saveEntry() }
validateButton?.setOnClickListener { validateEntry() }
mEntryEditViewModel.onTemplateChanged.observe(this) { template ->
this.mTemplate = template
@@ -564,9 +564,9 @@ class EntryEditActivity : DatabaseLockActivity(),
}
/**
* Saves the new entry or update an existing entry in the database
* Validate the new entry or update an existing entry in the database
*/
private fun saveEntry() {
private fun validateEntry() {
mAttachmentFileBinderManager?.stopUploadAllAttachments()
mEntryEditViewModel.requestEntryInfoUpdate(mDatabase)
}
@@ -648,14 +648,29 @@ class EntryEditActivity : DatabaseLockActivity(),
)
if (!addAttachmentEducationPerformed) {
val setupOtpView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_otp)
setupOtpView != null
val validateEntryEducationPerformed = setupOtpView != null
&& setupOtpView.isVisible
&& mEntryEditActivityEducation.checkAndPerformedSetUpOTPEducation(
setupOtpView,
{
setupOtp()
},
{
performedNextEducation()
}
)
if (!validateEntryEducationPerformed) {
val entryValidateView = validateButton
mAllowCustomFields
&& entryValidateView != null
&& entryValidateView.isVisible
&& mEntryEditActivityEducation.checkAndPerformedValidateEntryEducation(
entryValidateView,
{
validateEntry()
}
)
}
}
}
}