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 populate custom field in KDB database

Browse Source
This commit is contained in:
J-Jamet
2020-10-12 22:33:57 +02:00
parent 7a2c2df89e
commit ba956abb1c
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,15 +184,27 @@ class EntryEditActivity : LockingActivity(),
} }
registerInfo?.searchInfo?.let { searchInfo -> registerInfo?.searchInfo?.let { searchInfo ->
searchInfo.webDomain?.let { webDomain -> searchInfo.webDomain?.let { webDomain ->
tempEntryInfo?.addUniqueField(Field(EntryInfo.WEB_DOMAIN_FIELD_NAME, // If unable to save web domain in custom field or URL not populate, save in URL
ProtectedString(false, webDomain)) if (mDatabase?.allowEntryCustomFields() != true) {
) //|| tempEntryInfo?.url?.isEmpty() == true) {
} ?: run { val scheme = "http"
searchInfo.applicationId?.let { applicationId -> // TODO Retrieve scheme
tempEntryInfo?.addUniqueField(Field(EntryInfo.APPLICATION_ID_FIELD_NAME, tempEntryInfo?.url = "$scheme://$webDomain"
ProtectedString(false, applicationId)) } else {
// Save web domain in custom field
tempEntryInfo?.addUniqueField(Field(EntryInfo.WEB_DOMAIN_FIELD_NAME,
ProtectedString(false, webDomain))
) )
} }
} ?: run {
// Save application id in custom field
if (mDatabase?.allowEntryCustomFields() == true) {
searchInfo.applicationId?.let { applicationId ->
tempEntryInfo?.addUniqueField(Field(EntryInfo.APPLICATION_ID_FIELD_NAME,
ProtectedString(false, applicationId))
)
}
}
} }
} }
@@ -708,7 +720,7 @@ class EntryEditActivity : LockingActivity(),
} }
} }
private fun onApprovedBackPressed(approved: ()-> Unit) { private fun onApprovedBackPressed(approved: () -> Unit) {
AlertDialog.Builder(this) AlertDialog.Builder(this)
.setMessage(R.string.discard_changes) .setMessage(R.string.discard_changes)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)