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

Merge branch 'develop' into feature/Passkeys

Browse Source
This commit is contained in:
J-Jamet
2025-07-26 19:43:55 +02:00
parent d03693341e 3a67ec09d5
commit 19c987abc3
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -3,6 +3,7 @@ KeePassDX(4.1.3)
* Fix Biometric errors #2081 * Fix Biometric errors #2081
* Fixed timestamp in copy file #1981 #1983 * Fixed timestamp in copy file #1981 #1983
* Fix Template Email #1986 * Fix Template Email #1986
* Fix Search #2096
KeePassDX(4.1.2) KeePassDX(4.1.2)
* Fix URL search #1940 #1946 #2003 #2040 #2044 * Fix URL search #1940 #1946 #2003 #2040 #2044

2
app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt
View File

@@ -168,7 +168,7 @@ class MainCredentialActivity : DatabaseModeActivity() {
} }
// Listen password checkbox to init advanced unlock and confirmation button // Listen password checkbox to init advanced unlock and confirmation button
mainCredentialView?.onConditionToStoreCredentialChanged = { credentialStorage, verified -> mainCredentialView?.onConditionToStoreCredentialChanged = { _, verified ->
mAdvancedUnlockViewModel.checkUnlockAvailability( mAdvancedUnlockViewModel.checkUnlockAvailability(
conditionToStoreCredentialVerified = verified conditionToStoreCredentialVerified = verified
) )

6
app/src/main/java/com/kunzisoft/keepass/view/MainCredentialView.kt
View File

@@ -101,13 +101,13 @@ class MainCredentialView @JvmOverloads constructor(context: Context,
handled handled
} }
checkboxPasswordView.setOnCheckedChangeListener { view, checked -> checkboxPasswordView.setOnCheckedChangeListener { _, _ ->
onConditionToStoreCredentialChanged?.invoke( onConditionToStoreCredentialChanged?.invoke(
mCredentialStorage, mCredentialStorage,
conditionToStoreCredential() conditionToStoreCredential()
) )
} }
checkboxKeyFileView.setOnCheckedChangeListener { view, checked -> checkboxKeyFileView.setOnCheckedChangeListener { _, checked ->
if (checked) { if (checked) {
if (keyFileSelectionView.uri == null) { if (keyFileSelectionView.uri == null) {
checkboxKeyFileView.isChecked = false checkboxKeyFileView.isChecked = false
@@ -118,7 +118,7 @@ class MainCredentialView @JvmOverloads constructor(context: Context,
conditionToStoreCredential() conditionToStoreCredential()
) )
} }
checkboxHardwareView.setOnCheckedChangeListener { view, checked -> checkboxHardwareView.setOnCheckedChangeListener { _, checked ->
if (checked) { if (checked) {
if (hardwareKeySelectionView.hardwareKey == null) { if (hardwareKeySelectionView.hardwareKey == null) {
checkboxHardwareView.isChecked = false checkboxHardwareView.isChecked = false

1
fastlane/metadata/android/en-US/changelogs/135.txt
View File

@@ -2,3 +2,4 @@
* Fix Biometric errors #2081 * Fix Biometric errors #2081
* Fixed timestamp in copy file #1981 #1983 * Fixed timestamp in copy file #1981 #1983
* Fix Template Email #1986 * Fix Template Email #1986
* Fix Search #2096

1
fastlane/metadata/android/fr-FR/changelogs/135.txt
View File

@@ -2,3 +2,4 @@
* Correction des erreurs biométriques #2081 * Correction des erreurs biométriques #2081
* Correction du timestamp dans le fichier de copie #1981 #1983 * Correction du timestamp dans le fichier de copie #1981 #1983
* Correction des gabaris Email #1986 * Correction des gabaris Email #1986
* Correction de la recherche #2096