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 tag '4.1.5' into develop

Browse Source 
4.1.5
This commit is contained in:
J-Jamet
2025-08-14 17:18:34 +02:00
parent 23bebf9597 1c30d533ad
commit cb5a725d50
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt
View File

@@ -70,7 +70,7 @@ class DeviceUnlockFragment: Fragment() {
ActivityResultContracts.StartActivityForResult()
) { result ->
if (result.resultCode == Activity.RESULT_OK) {
mDeviceUnlockViewModel.onAuthenticationSucceeded(result)
mDeviceUnlockViewModel.onAuthenticationSucceeded()
} else {
setAuthenticationFailed()
}
@@ -298,10 +298,8 @@ class DeviceUnlockFragment: Fragment() {
lifecycleScope.launch(Dispatchers.Main) {
showViews(true)
setAdvancedUnlockedTitleView(R.string.unlock_and_link_biometric)
context?.let { context ->
mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener { view ->
mDeviceUnlockViewModel.showPrompt()
}
mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener { _ ->
mDeviceUnlockViewModel.showPrompt()
}
}
}
@@ -310,10 +308,8 @@ class DeviceUnlockFragment: Fragment() {
lifecycleScope.launch(Dispatchers.Main) {
showViews(true)
setAdvancedUnlockedTitleView(R.string.unlock)
context?.let { context ->
mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener { view ->
mDeviceUnlockViewModel.showPrompt()
}
mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener { _ ->
mDeviceUnlockViewModel.showPrompt()
}
}
}

4
app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
View File

@@ -152,9 +152,7 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat
}
@RequiresApi(Build.VERSION_CODES.M)
fun onAuthenticationSucceeded(
activityResult: ActivityResult
) {
fun onAuthenticationSucceeded() {
cryptoPrompt?.let { prompt ->
when (prompt.type) {
DeviceUnlockCryptoPromptType.CREDENTIAL_ENCRYPTION ->