diff --git a/CHANGELOG b/CHANGELOG index 7848fc100..f3e245080 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ KeePassDX(3.4.0) * Show visual password strength indicator with entropy #631 #869 - * Dynamically save password generator configuration #618 + * Dynamically save password generator configuration #618 #696 * Add advanced password filters #1052 * Add editable chars fields #539 * Add color for special password chars #454 diff --git a/app/src/main/java/com/kunzisoft/keepass/view/PasswordView.kt b/app/src/main/java/com/kunzisoft/keepass/view/PasswordView.kt index 609aee9e6..604d35280 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/PasswordView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/PasswordView.kt @@ -21,6 +21,7 @@ package com.kunzisoft.keepass.view import android.content.Context import android.text.Editable +import android.text.InputType import android.text.SpannableString import android.text.TextWatcher import android.util.AttributeSet @@ -46,6 +47,8 @@ class PasswordView @JvmOverloads constructor(context: Context, private val passwordStrengthProgress: LinearProgressIndicator private val passwordEntropy: TextView + private var mShowPassword: Boolean = false + private var mPasswordTextWatcher: MutableList = mutableListOf() private val passwordTextWatcher = object : TextWatcher { override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { @@ -68,13 +71,29 @@ class PasswordView @JvmOverloads constructor(context: Context, } } - init { + context.theme.obtainStyledAttributes( + attrs, + R.styleable.PasswordView, + 0, 0).apply { + try { + mShowPassword = getBoolean(R.styleable.PasswordView_passwordVisible, + !PreferencesUtil.hideProtectedValue(context)) + } finally { + recycle() + } + } + val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater? inflater?.inflate(R.layout.view_password, this) passwordInputLayout = findViewById(R.id.password_input_layout) passwordText = findViewById(R.id.password_text) + if (mShowPassword) { + passwordText?.inputType = passwordText.inputType and + InputType.TYPE_TEXT_VARIATION_PASSWORD or + InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD + } passwordText?.applyFontVisibility() passwordText.addTextChangedListener(passwordTextWatcher) passwordStrengthProgress = findViewById(R.id.password_strength_progress) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt b/app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt index 9e0cff01f..71ee1e467 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt @@ -177,7 +177,11 @@ class TextEditFieldView @JvmOverloads constructor(context: Context, fun setProtection(protection: Boolean) { if (protection) { labelView.endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE - valueView.inputType = valueView.inputType or InputType.TYPE_TEXT_VARIATION_PASSWORD + val visibilityTag = if (PreferencesUtil.hideProtectedValue(context)) + InputType.TYPE_TEXT_VARIATION_PASSWORD + else + InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD + valueView.inputType = valueView.inputType or visibilityTag } } diff --git a/app/src/main/res/layout/fragment_set_main_credential.xml b/app/src/main/res/layout/fragment_set_main_credential.xml index 8804769e8..144e530e3 100644 --- a/app/src/main/res/layout/fragment_set_main_credential.xml +++ b/app/src/main/res/layout/fragment_set_main_credential.xml @@ -74,7 +74,8 @@ + android:layout_height="wrap_content" + app:passwordVisible="false"/> + + + + diff --git a/fastlane/metadata/android/en-US/changelogs/106.txt b/fastlane/metadata/android/en-US/changelogs/106.txt index 52f48548b..8aa190cfc 100644 --- a/fastlane/metadata/android/en-US/changelogs/106.txt +++ b/fastlane/metadata/android/en-US/changelogs/106.txt @@ -1,5 +1,5 @@ * Show visual password strength indicator with entropy #631 #869 - * Dynamically save password generator configuration #618 + * Dynamically save password generator configuration #618 #696 * Add advanced password filters #1052 * Add editable chars fields #539 * Add color for special password chars #454 \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/106.txt b/fastlane/metadata/android/fr-FR/changelogs/106.txt index 4dd6d48e7..21937da0e 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/106.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/106.txt @@ -1,5 +1,5 @@ * Affichage d'un indicateur visuel de la force du mot de passe avec entropie #631 #869 - * Sauvegarde dynamique de la configuration du générateur de mots de passe #618 + * Sauvegarde dynamique de la configuration du générateur de mots de passe #618 #696 * Ajout des filtres de mots de passe avancés #1052 * Ajout de champs éditable de génération #539 * Ajout des couleurs pour chaque caractère spécial de mots de passe #454 \ No newline at end of file