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 not referenced fields

Browse Source
This commit is contained in:
J-Jamet
2021-06-24 17:19:42 +02:00
parent 12342ac426
commit 6f943db012
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/kunzisoft/keepass/database/element/template/Template.kt
View File

@@ -28,6 +28,7 @@ import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.B
import com.kunzisoft.keepass.database.element.template.TemplateField.LABEL_EXPIRATION
import com.kunzisoft.keepass.database.element.template.TemplateField.LABEL_NOTES
import com.kunzisoft.keepass.database.element.template.TemplateField.LABEL_PASSWORD
import com.kunzisoft.keepass.database.element.template.TemplateField.LABEL_TITLE
import com.kunzisoft.keepass.database.element.template.TemplateField.LABEL_URL
import com.kunzisoft.keepass.database.element.template.TemplateField.LABEL_USERNAME
import java.util.*
@@ -114,20 +115,26 @@ class Template : Parcelable {
return arrayOfNulls(size)
}
val STANDARD: Template
get() {
val sections = ArrayList<TemplateSection>()
val mainSection = TemplateSection(ArrayList<TemplateAttribute>().apply {
add(TemplateAttribute(LABEL_USERNAME, TemplateAttributeType.INLINE))
add(TemplateAttribute(LABEL_PASSWORD,
val TITLE_ATTRIBUTE = TemplateAttribute(LABEL_TITLE, TemplateAttributeType.INLINE)
val USERNAME_ATTRIBUTE = TemplateAttribute(LABEL_USERNAME, TemplateAttributeType.INLINE)
val PASSWORD_ATTRIBUTE = TemplateAttribute(LABEL_PASSWORD,
TemplateAttributeType.SMALL_MULTILINE,
true,
"",
TemplateAttributeAction.PASSWORD_GENERATION)
)
add(TemplateAttribute(LABEL_URL, TemplateAttributeType.INLINE))
add(TemplateAttribute(LABEL_EXPIRATION, TemplateAttributeType.DATETIME))
add(TemplateAttribute(LABEL_NOTES, TemplateAttributeType.MULTILINE))
val URL_ATTRIBUTE = TemplateAttribute(LABEL_URL, TemplateAttributeType.INLINE)
val EXPIRATION_ATTRIBUTE = TemplateAttribute(LABEL_EXPIRATION, TemplateAttributeType.DATETIME)
val NOTES_ATTRIBUTE = TemplateAttribute(LABEL_NOTES, TemplateAttributeType.MULTILINE)
val STANDARD: Template
get() {
val sections = ArrayList<TemplateSection>()
val mainSection = TemplateSection(ArrayList<TemplateAttribute>().apply {
add(USERNAME_ATTRIBUTE)
add(PASSWORD_ATTRIBUTE)
add(URL_ATTRIBUTE)
add(EXPIRATION_ATTRIBUTE)
add(NOTES_ATTRIBUTE)
})
sections.add(mainSection)
return Template(DatabaseVersioned.UUID_ZERO,

48
app/src/main/java/com/kunzisoft/keepass/view/TemplateAbstractView.kt
View File

@@ -168,14 +168,12 @@ abstract class TemplateAbstractView<TEntryFieldView: GenericEntryFieldView, TDat
abstract fun preProcessTemplate()
private fun buildViewForNotReferencedField(field: Field, attributeType: TemplateAttributeType): View? {
val standardFieldTemplateAttribute = TemplateAttribute(
field.name,
attributeType,
field.protectedValue.isProtected,
field.protectedValue.stringValue)
val fieldTag: String = getTagFromStandardTemplateAttribute(standardFieldTemplateAttribute)
return buildViewForTemplateField(standardFieldTemplateAttribute, field, fieldTag)
/**
* Not referenced fields are standard fields with content but not in template
*/
private fun buildViewForNotReferencedField(field: Field, templateAttribute: TemplateAttribute): View? {
val fieldTag: String = getTagFromStandardTemplateAttribute(templateAttribute)
return buildViewForTemplateField(templateAttribute, field, fieldTag)
}
private fun buildViewForCustomField(field: Field): View? {
@@ -241,8 +239,7 @@ abstract class TemplateAbstractView<TEntryFieldView: GenericEntryFieldView, TDat
@Suppress("UNCHECKED_CAST")
private fun populateEntryFieldView(fieldTag: String,
label: String,
type: TemplateAttributeType,
templateAttribute: TemplateAttribute,
entryInfoValue: String,
showEmptyFields: Boolean) {
var fieldView: TEntryFieldView? = findViewWithTag(fieldTag)
@@ -251,8 +248,9 @@ abstract class TemplateAbstractView<TEntryFieldView: GenericEntryFieldView, TDat
} else if (fieldView == null && entryInfoValue.isNotEmpty()) {
// Add new not referenced view if standard field not in template
fieldView = buildViewForNotReferencedField(
Field(label, ProtectedString(false, entryInfoValue)),
type
Field(templateAttribute.label,
ProtectedString(templateAttribute.protected, "")),
templateAttribute
) as? TEntryFieldView?
fieldView?.let {
addNotReferencedView(it as View)
@@ -264,8 +262,7 @@ abstract class TemplateAbstractView<TEntryFieldView: GenericEntryFieldView, TDat
@Suppress("UNCHECKED_CAST")
private fun populateDateTimeView(fieldTag: String,
label: String,
type: TemplateAttributeType,
templateAttribute: TemplateAttribute,
expires: Boolean,
expiryTime: DateInstant,
showEmptyFields: Boolean) {
@@ -275,8 +272,9 @@ abstract class TemplateAbstractView<TEntryFieldView: GenericEntryFieldView, TDat
fieldView?.isFieldVisible = false
} else if (fieldView == null && expires) {
fieldView = buildViewForNotReferencedField(
Field(label, ProtectedString(false, "")),
type
Field(templateAttribute.label,
ProtectedString(templateAttribute.protected, "")),
templateAttribute
) as? TDateTimeView?
fieldView?.let {
addNotReferencedView(it as View)
@@ -293,34 +291,28 @@ abstract class TemplateAbstractView<TEntryFieldView: GenericEntryFieldView, TDat
mEntryInfo?.let { entryInfo ->
populateEntryFieldView(FIELD_TITLE_TAG,
TemplateField.LABEL_TITLE,
TemplateAttributeType.INLINE,
Template.TITLE_ATTRIBUTE,
entryInfo.title,
showEmptyFields)
populateEntryFieldView(FIELD_USERNAME_TAG,
TemplateField.LABEL_USERNAME,
TemplateAttributeType.INLINE,
Template.USERNAME_ATTRIBUTE,
entryInfo.username,
showEmptyFields)
populateEntryFieldView(FIELD_PASSWORD_TAG,
TemplateField.LABEL_PASSWORD,
TemplateAttributeType.INLINE,
Template.PASSWORD_ATTRIBUTE,
entryInfo.password,
showEmptyFields)
populateEntryFieldView(FIELD_URL_TAG,
TemplateField.LABEL_URL,
TemplateAttributeType.INLINE,
Template.URL_ATTRIBUTE,
entryInfo.url,
showEmptyFields)
populateDateTimeView(FIELD_EXPIRES_TAG,
TemplateField.LABEL_EXPIRATION,
TemplateAttributeType.DATETIME,
Template.EXPIRATION_ATTRIBUTE,
entryInfo.expires,
entryInfo.expiryTime,
showEmptyFields)
populateEntryFieldView(FIELD_NOTES_TAG,
TemplateField.LABEL_NOTES,
TemplateAttributeType.MULTILINE,
Template.NOTES_ATTRIBUTE,
entryInfo.notes,
showEmptyFields)