template field

2025-12-04 15:49:33 +01:00 · 2022-10-26 11:33:51 +01:00
parent 7d7e3f4ad6
commit 50343193e1
12 changed files with 136 additions and 107 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
@@ -17,6 +17,7 @@ import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.getLocalizedName
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.StreamDirection
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -42,6 +42,7 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.getLocalizedName
 import com.kunzisoft.keepass.otp.OtpElement
 import com.kunzisoft.keepass.otp.OtpType
 import com.kunzisoft.keepass.settings.PreferencesUtil
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
@@ -11,6 +11,7 @@ import android.widget.TextView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.template.Template
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.getLocalizedName
 import com.kunzisoft.keepass.icons.IconDrawableFactory


--- a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateFieldKt.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateFieldKt.kt
@@ -0,0 +1,57 @@
+package com.kunzisoft.keepass.database.element.template
+
+import android.content.Context
+import com.kunzisoft.keepass.R
+
+
+fun TemplateField.isStandardPasswordName(context: Context, name: String): Boolean {
+    return name.equals(LABEL_PASSWORD, true)
+            || name == getLocalizedName(context, LABEL_PASSWORD)
+}
+
+fun TemplateField.getLocalizedName(context: Context?, name: String): String {
+    if (context == null
+        || TemplateEngine.containsTemplateDecorator(name))
+        return name
+
+    return when {
+        LABEL_STANDARD.equals(name, true) -> context.getString(R.string.standard)
+        LABEL_TEMPLATE.equals(name, true) -> context.getString(R.string.template)
+        LABEL_VERSION.equals(name, true) -> context.getString(R.string.version)
+
+        LABEL_TITLE.equals(name, true) -> context.getString(R.string.entry_title)
+        LABEL_USERNAME.equals(name, true) -> context.getString(R.string.entry_user_name)
+        LABEL_PASSWORD.equals(name, true) -> context.getString(R.string.entry_password)
+        LABEL_URL.equals(name, true) -> context.getString(R.string.entry_url)
+        LABEL_EXPIRATION.equals(name, true) -> context.getString(R.string.entry_expires)
+        LABEL_NOTES.equals(name, true) -> context.getString(R.string.entry_notes)
+
+        LABEL_DEBIT_CREDIT_CARD.equals(name, true) -> context.getString(R.string.debit_credit_card)
+        LABEL_HOLDER.equals(name, true) -> context.getString(R.string.holder)
+        LABEL_NUMBER.equals(name, true) -> context.getString(R.string.number)
+        LABEL_CVV.equals(name, true) -> context.getString(R.string.card_verification_value)
+        LABEL_PIN.equals(name, true) -> context.getString(R.string.personal_identification_number)
+        LABEL_ID_CARD.equals(name, true) -> context.getString(R.string.id_card)
+        LABEL_NAME.equals(name, true) -> context.getString(R.string.name)
+        LABEL_PLACE_OF_ISSUE.equals(name, true) -> context.getString(R.string.place_of_issue)
+        LABEL_DATE_OF_ISSUE.equals(name, true) -> context.getString(R.string.date_of_issue)
+        LABEL_EMAIL.equals(name, true) -> context.getString(R.string.email)
+        LABEL_EMAIL_ADDRESS.equals(name, true) -> context.getString(R.string.email_address)
+        LABEL_WIRELESS.equals(name, true) -> context.getString(R.string.wireless)
+        LABEL_SSID.equals(name, true) -> context.getString(R.string.ssid)
+        LABEL_TYPE.equals(name, true) -> context.getString(R.string.type)
+        LABEL_CRYPTOCURRENCY.equals(name, true) -> context.getString(R.string.cryptocurrency)
+        LABEL_TOKEN.equals(name, false) -> context.getString(R.string.token)
+        LABEL_PUBLIC_KEY.equals(name, true) -> context.getString(R.string.public_key)
+        LABEL_PRIVATE_KEY.equals(name, true) -> context.getString(R.string.private_key)
+        LABEL_SEED.equals(name, true) -> context.getString(R.string.seed)
+        LABEL_ACCOUNT.equals(name, true) -> context.getString(R.string.account)
+        LABEL_BANK.equals(name, true) -> context.getString(R.string.bank)
+        LABEL_BIC.equals(name, true) -> context.getString(R.string.bank_identifier_code)
+        LABEL_IBAN.equals(name, true) -> context.getString(R.string.international_bank_account_number)
+        LABEL_SECURE_NOTE.equals(name, true) -> context.getString(R.string.secure_note)
+        LABEL_MEMBERSHIP.equals(name, true) -> context.getString(R.string.membership)
+
+        else -> name
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/view/TemplateEditView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/TemplateEditView.kt
@@ -16,6 +16,7 @@ import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.element.template.TemplateAttribute
 import com.kunzisoft.keepass.database.element.template.TemplateAttributeAction
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.getLocalizedName
 import com.kunzisoft.keepass.otp.OtpEntryFields
 import org.joda.time.DateTime

--- a/app/src/main/java/com/kunzisoft/keepass/view/TemplateView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/TemplateView.kt
@@ -9,6 +9,7 @@ import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.element.template.TemplateAttribute
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.getLocalizedName
 import com.kunzisoft.keepass.model.OtpModel
 import com.kunzisoft.keepass.otp.OtpElement
 import com.kunzisoft.keepass.otp.OtpEntryFields.OTP_TOKEN_FIELD
--- a/app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt
@@ -21,6 +21,7 @@ import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.isStandardPasswordName
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil

--- a/app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt
@@ -39,6 +39,7 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.element.template.isStandardPasswordName
 import com.kunzisoft.keepass.model.EntryInfo.Companion.APPLICATION_ID_FIELD_NAME
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,10 +78,12 @@
    <string name="content_description_remove_from_list">Remove</string>
    <string name="content_description_keyboard_close_fields">Close fields</string>
    <string name="select_to_copy">Select to copy %1$s to clipboard</string>
+    <string name="retrieving_db_key">Retrieving database key…</string>
    <string name="waiting_challenge_request">Waiting for the challenge request…</string>
    <string name="waiting_challenge_response">Waiting for the challenge response…</string>
    <string name="database">Database</string>
    <string name="template_group_name">Templates</string>
+    <string name="decrypting_db">Decrypting database content…</string>
    <string name="default_checkbox">Use as default database</string>
    <string name="digits">Digits</string>
    <string name="html_about_licence">KeePassDX © %1$d Kunzisoft is &lt;strong&gt;open source&lt;/strong&gt; and &lt;strong&gt;without advertising&lt;/strong&gt;.
@@ -90,8 +92,10 @@
    <string name="html_about_contribution">In order to &lt;strong&gt;keep our freedom&lt;/strong&gt;, &lt;strong&gt;fix bugs&lt;/strong&gt;, &lt;strong&gt;add features&lt;/strong&gt; and &lt;strong&gt;to be always active&lt;/strong&gt;, we count on your &lt;strong&gt;contribution&lt;/strong&gt;.</string>
    <string name="entry_accessed">Accessed</string>
    <string name="entry_cancel">Cancel</string>
+    <string name="entry_notes">Notes</string>
    <string name="entry_confpassword">Confirm password</string>
    <string name="entry_created">Created</string>
+    <string name="entry_expires">Expires</string>
    <string name="expired">Expired</string>
    <string name="entry_UUID">UUID</string>
    <string name="entry_history">History</string>
@@ -104,9 +108,11 @@
    <string name="auto_type">Auto-Type</string>
    <string name="auto_type_sequence">Auto-Type sequence</string>
    <string name="entry_not_found">Could not find entry data.</string>
+    <string name="entry_password">Password</string>
    <string name="tags">Tags</string>
    <string name="custom_data">Custom data</string>
    <string name="save">Save</string>
+    <string name="entry_title">Title</string>
    <string name="entry_setup_otp">Set up one-time password</string>
    <string name="otp_type">OTP type</string>
    <string name="otp_secret">Secret</string>
@@ -118,8 +124,38 @@
    <string name="current_group">Current group</string>
    <string name="case_sensitive">Case sensitive</string>
    <string name="regex">Regular expression</string>
+    <string name="debit_credit_card">Debit / Credit Card</string>
+    <string name="holder">Holder</string>
+    <string name="number">Number</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="id_card">ID Card</string>
+    <string name="name">Name</string>
+    <string name="place_of_issue">Place of issue</string>
+    <string name="date_of_issue">Date of issue</string>
+    <string name="email">Email</string>
+    <string name="email_address">Email address</string>
+    <string name="wireless">Wi-Fi</string>
+    <string name="ssid">SSID</string>
+    <string name="type">Type</string>
+    <string name="cryptocurrency">Cryptocurrency wallet</string>
+    <string name="token">Token</string>
+    <string name="public_key">Public key</string>
+    <string name="private_key">Private key</string>
+    <string name="seed">Seed</string>
+    <string name="account">Account</string>
+    <string name="bank">Bank</string>
    <string name="bank_name">Bank name</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="secure_note">Secure Note</string>
+    <string name="membership">Membership</string>
+    <string name="standard">Standard</string>
+    <string name="template">Template</string>
+    <string name="version">Version</string>
    <string name="entry_otp">OTP</string>
+    <string name="entry_url">URL</string>
+    <string name="entry_user_name">Username</string>
    <string name="error_arc4">The Arcfour stream cipher is not supported.</string>
    <string name="error_can_not_handle_uri">Could not handle this URI in KeePassDX.</string>
    <string name="error_file_not_create">Could not create file</string>
@@ -130,6 +166,10 @@
    <string name="error_word_reserved">This word is reserved and cannot be used.</string>
    <string name="error_nokeyfile">Select a keyfile.</string>
    <string name="error_no_hardware_key">Select a hardware key.</string>
+    <string name="error_out_of_memory">No memory to load your entire database.</string>
+    <string name="error_XML_malformed">XML malformed.</string>
+    <string name="error_load_database">Could not load the database.</string>
+    <string name="error_load_database_KDF_memory">Could not load the key. Try to lower the KDF \"Memory Usage\".</string>
    <string name="error_pass_gen_type">At least one password generation type must be selected.</string>
    <string name="error_disallow_no_credentials">At least one credential must be set.</string>
    <string name="error_pass_match">The passwords do not match.</string>
@@ -138,8 +178,13 @@
    <string name="error_label_exists">This label already exists.</string>
    <string name="error_wrong_length">Enter a positive integer number in the \"Length\" field.</string>
    <string name="error_autofill_enable_service">Could not enable autofill service.</string>
+    <string name="error_move_group_here">You cannot move a group here.</string>
+    <string name="error_move_entry_here">You cannot move an entry here.</string>
+    <string name="error_copy_entry_here">You cannot copy an entry here.</string>
+    <string name="error_copy_group_here">You cannot copy a group here.</string>
    <string name="error_create_database">Unable to create database file.</string>
    <string name="error_create_database_file">Unable to create database with this password and keyfile.</string>
+    <string name="error_save_database">Could not save the database.</string>
    <string name="error_otp_secret_key">Secret key must be in Base32 format.</string>
    <string name="error_otp_counter">Counter must be between %1$d and %2$d.</string>
    <string name="error_otp_period">Period must be between %1$d and %2$d seconds.</string>
@@ -160,8 +205,14 @@
    <string name="error_no_response_from_challenge">Unable to get the response from the challenge.</string>
    <string name="error_cancel_by_user">Cancelled by user.</string>
    <string name="error_driver_required">Driver for %1$s is required.</string>
+    <string name="error_unable_merge_database_kdb">Unable to merge from a database V1.</string>
+    <string name="error_location_unknown">Database location is unknown, database action cannot be performed.</string>
+    <string name="error_hardware_key_unsupported">Hardware key is not supported.</string>
+    <string name="error_empty_key">"Key cannot be empty."</string>
    <string name="field_name">Field name</string>
    <string name="field_value">Field value</string>
+    <string name="file_not_found_content">Could not find file. Try reopening it from your file browser.</string>
+    <string name="corrupted_file">Corrupted file.</string>
    <string name="file_browser">File manager</string>
    <string name="generate_password">Generate password</string>
    <string name="hint_conf_pass">Confirm password</string>
@@ -173,6 +224,10 @@
    <string name="hint_pass">Password</string>
    <string name="password">Password</string>
    <string name="passphrase">Passphrase</string>
+    <string name="invalid_credentials">Could not read credentials.</string>
+    <string name="invalid_algorithm">Wrong algorithm.</string>
+    <string name="invalid_db_same_uuid">%1$s with the same UUID %2$s already exists.</string>
+    <string name="invalid_db_sig">Could not recognize the database format.</string>
    <string name="keyfile_is_empty">The keyfile is empty.</string>
    <string name="length">Length</string>
    <string name="hide_password_title">Hide passwords</string>
@@ -294,6 +349,7 @@
    <string name="special">Special</string>
    <string name="search">Search</string>
    <string name="underline">Underline</string>
+    <string name="unsupported_db_version">Unsupported database version.</string>
    <string name="uppercase">Upper-case</string>
    <string name="warning">Warning</string>
    <string name="warning_password_encoding">Avoid password characters outside of text encoding format in database file (unrecognized chars are converted to the same letter).</string>
@@ -431,6 +487,10 @@
    <string name="application_appearance">Interface</string>
    <string name="other">Other</string>
    <string name="compression">Compression</string>
+    <string name="compression_none">None</string>
+    <string name="compression_gzip">Gzip</string>
+    <string name="recycle_bin">Recycle bin</string>
+    <string name="templates">Templates</string>
    <string name="keyboard">Keyboard</string>
    <string name="magic_keyboard_title">Magikeyboard</string>
    <string name="magic_keyboard_explanation_summary">Activate a custom keyboard populating your passwords and all identity fields</string>
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -52,9 +52,6 @@ dependencies {
    // Apache Commons
    implementation 'commons-io:commons-io:2.8.0'
    implementation 'commons-codec:commons-codec:1.15'
-    // Icon pack
-    implementation project(path: ':icon-pack-classic')
-    implementation project(path: ':icon-pack-material')

    // Database
    implementation "androidx.room:room-runtime:$room_version"
--- a/database/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateField.kt
+++ b/database/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateField.kt
@@ -18,9 +18,6 @@
 */
 package com.kunzisoft.keepass.database.element.template

-import android.content.Context
-import com.kunzisoft.keepass.database.R
-
 object TemplateField {

    const val LABEL_STANDARD = "Standard"
@@ -60,66 +57,14 @@ object TemplateField {
    const val LABEL_SECURE_NOTE = "Secure Note"
    const val LABEL_MEMBERSHIP = "Membership"

-    fun isStandardPasswordName(context: Context, name: String): Boolean {
-        return name.equals(LABEL_PASSWORD, true)
-            || name == getLocalizedName(context, LABEL_PASSWORD)
-    }
-
    fun isStandardFieldName(name: String): Boolean {
        return arrayOf(
-                LABEL_TITLE,
-                LABEL_USERNAME,
-                LABEL_PASSWORD,
-                LABEL_URL,
-                LABEL_EXPIRATION,
-                LABEL_NOTES
+            LABEL_TITLE,
+            LABEL_USERNAME,
+            LABEL_PASSWORD,
+            LABEL_URL,
+            LABEL_EXPIRATION,
+            LABEL_NOTES
        ).firstOrNull { it.equals(name, true) } != null
    }
-
-    fun getLocalizedName(context: Context?, name: String): String {
-        if (context == null
-                || TemplateEngine.containsTemplateDecorator(name))
-            return name
-
-        return when {
-            LABEL_STANDARD.equals(name, true) -> context.getString(R.string.standard)
-            LABEL_TEMPLATE.equals(name, true) -> context.getString(R.string.template)
-            LABEL_VERSION.equals(name, true) -> context.getString(R.string.version)
-
-            LABEL_TITLE.equals(name, true) -> context.getString(R.string.entry_title)
-            LABEL_USERNAME.equals(name, true) -> context.getString(R.string.entry_user_name)
-            LABEL_PASSWORD.equals(name, true) -> context.getString(R.string.entry_password)
-            LABEL_URL.equals(name, true) -> context.getString(R.string.entry_url)
-            LABEL_EXPIRATION.equals(name, true) -> context.getString(R.string.entry_expires)
-            LABEL_NOTES.equals(name, true) -> context.getString(R.string.entry_notes)
-
-            LABEL_DEBIT_CREDIT_CARD.equals(name, true) -> context.getString(R.string.debit_credit_card)
-            LABEL_HOLDER.equals(name, true) -> context.getString(R.string.holder)
-            LABEL_NUMBER.equals(name, true) -> context.getString(R.string.number)
-            LABEL_CVV.equals(name, true) -> context.getString(R.string.card_verification_value)
-            LABEL_PIN.equals(name, true) -> context.getString(R.string.personal_identification_number)
-            LABEL_ID_CARD.equals(name, true) -> context.getString(R.string.id_card)
-            LABEL_NAME.equals(name, true) -> context.getString(R.string.name)
-            LABEL_PLACE_OF_ISSUE.equals(name, true) -> context.getString(R.string.place_of_issue)
-            LABEL_DATE_OF_ISSUE.equals(name, true) -> context.getString(R.string.date_of_issue)
-            LABEL_EMAIL.equals(name, true) -> context.getString(R.string.email)
-            LABEL_EMAIL_ADDRESS.equals(name, true) -> context.getString(R.string.email_address)
-            LABEL_WIRELESS.equals(name, true) -> context.getString(R.string.wireless)
-            LABEL_SSID.equals(name, true) -> context.getString(R.string.ssid)
-            LABEL_TYPE.equals(name, true) -> context.getString(R.string.type)
-            LABEL_CRYPTOCURRENCY.equals(name, true) -> context.getString(R.string.cryptocurrency)
-            LABEL_TOKEN.equals(name, false) -> context.getString(R.string.token)
-            LABEL_PUBLIC_KEY.equals(name, true) -> context.getString(R.string.public_key)
-            LABEL_PRIVATE_KEY.equals(name, true) -> context.getString(R.string.private_key)
-            LABEL_SEED.equals(name, true) -> context.getString(R.string.seed)
-            LABEL_ACCOUNT.equals(name, true) -> context.getString(R.string.account)
-            LABEL_BANK.equals(name, true) -> context.getString(R.string.bank)
-            LABEL_BIC.equals(name, true) -> context.getString(R.string.bank_identifier_code)
-            LABEL_IBAN.equals(name, true) -> context.getString(R.string.international_bank_account_number)
-            LABEL_SECURE_NOTE.equals(name, true) -> context.getString(R.string.secure_note)
-            LABEL_MEMBERSHIP.equals(name, true) -> context.getString(R.string.membership)
-
-            else -> name
-        }
-    }
 }
--- a/database/src/main/res/values/strings.xml
+++ b/database/src/main/res/values/strings.xml
@@ -5,43 +5,6 @@
    <string name="recycle_bin">Recycle bin</string>
    <string name="templates">Templates</string>
    
-    <string name="standard">Standard</string>
-    <string name="template">Template</string>
-    <string name="version">Version</string>
-
-    <string name="entry_title">Title</string>
-    <string name="entry_user_name">Username</string>
-    <string name="entry_password">Password</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_expires">Expires</string>
-    <string name="entry_notes">Notes</string>
-
-    <string name="debit_credit_card">Debit / Credit Card</string>
-    <string name="holder">Holder</string>
-    <string name="number">Number</string>
-    <string name="card_verification_value">CVV</string>
-    <string name="personal_identification_number">PIN</string>
-    <string name="id_card">ID Card</string>
-    <string name="name">Name</string>
-    <string name="place_of_issue">Place of issue</string>
-    <string name="date_of_issue">Date of issue</string>
-    <string name="email">Email</string>
-    <string name="email_address">Email address</string>
-    <string name="wireless">Wi-Fi</string>
-    <string name="ssid">SSID</string>
-    <string name="type">Type</string>
-    <string name="cryptocurrency">Cryptocurrency wallet</string>
-    <string name="token">Token</string>
-    <string name="public_key">Public key</string>
-    <string name="private_key">Private key</string>
-    <string name="seed">Seed</string>
-    <string name="account">Account</string>
-    <string name="bank">Bank</string>
-    <string name="bank_identifier_code">SWIFT / BIC</string>
-    <string name="international_bank_account_number">IBAN</string>
-    <string name="secure_note">Secure Note</string>
-    <string name="membership">Membership</string>
-
    <string name="file_not_found_content">Could not find file. Try reopening it from your file browser.</string>
    <string name="corrupted_file">Corrupted file.</string>
    <string name="invalid_algorithm">Wrong algorithm.</string>