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

Check if current database is the same after activity result

Browse Source
This commit is contained in:
J-Jamet
2020-12-14 16:56:15 +01:00
parent c522e87da8
commit baa9b88512
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
View File

@@ -151,17 +151,19 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
fun loadDatabase(databaseUri: Uri?, autoOpenPrompt: Boolean) { fun loadDatabase(databaseUri: Uri?, autoOpenPrompt: Boolean) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// To get device credential unlock result, only if same database uri // To get device credential unlock result, only if same database uri
activityResult?.let { if (databaseUri != null && mAdvancedUnlockEnabled) {
if (databaseUri != null) { activityResult?.let {
advancedUnlockManager?.onActivityResult(it.requestCode, it.resultCode) if (databaseUri == databaseFileUri) {
} advancedUnlockManager?.onActivityResult(it.requestCode, it.resultCode)
} ?: run { } else {
if (databaseUri != null && mAdvancedUnlockEnabled) { disconnect()
}
} ?: run {
connect(databaseUri) connect(databaseUri)
this.mAutoOpenPrompt = autoOpenPrompt this.mAutoOpenPrompt = autoOpenPrompt
} else {
disconnect()
} }
} else {
disconnect()
} }
activityResult = null activityResult = null
} }