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: initDecryptData #2105

Browse Source
This commit is contained in:
J-Jamet
2025-08-12 15:33:35 +02:00
parent a680db9707
commit 9cae3f0794
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockManager.kt
View File

@@ -134,12 +134,12 @@ class DeviceUnlockManager(private var appContext: Context) {
@Synchronized fun initEncryptData( @Synchronized fun initEncryptData(
actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
) { ) {
initEncryptData(actionIfCypherInit, true) initEncryptData(true, actionIfCypherInit)
} }
@Synchronized private fun initEncryptData( @Synchronized private fun initEncryptData(
actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit, firstLaunch: Boolean,
firstLaunch: Boolean actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
) { ) {
try { try {
getSecretKey()?.let { secretKey -> getSecretKey()?.let { secretKey ->
@@ -168,7 +168,7 @@ class DeviceUnlockManager(private var appContext: Context) {
Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException) Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
if (firstLaunch) { if (firstLaunch) {
deleteAllEntryKeysInKeystoreForBiometric(appContext) deleteAllEntryKeysInKeystoreForBiometric(appContext)
initEncryptData(actionIfCypherInit, false) initEncryptData(false, actionIfCypherInit)
} else { } else {
throw invalidKeyException throw invalidKeyException
} }
@@ -195,6 +195,13 @@ class DeviceUnlockManager(private var appContext: Context) {
} }
@Synchronized fun initDecryptData( @Synchronized fun initDecryptData(
ivSpecValue: ByteArray,
actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
) {
initDecryptData(ivSpecValue, true, actionIfCypherInit)
}
@Synchronized private fun initDecryptData(
ivSpecValue: ByteArray, ivSpecValue: ByteArray,
firstLaunch: Boolean = true, firstLaunch: Boolean = true,
actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit