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: Backup parameters init

Browse Source
This commit is contained in:
J-Jamet
2025-09-11 12:04:39 +02:00
parent ccd5da0962
commit 803d637510
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
View File

@@ -23,6 +23,7 @@ import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle
import android.util.Log import android.util.Log
import android.widget.Toast import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
@@ -82,8 +83,8 @@ class PasskeyLauncherActivity : DatabaseModeActivity() {
private var mCreationParameters: PublicKeyCredentialCreationParameters? = null private var mCreationParameters: PublicKeyCredentialCreationParameters? = null
private var mPasskey: Passkey? = null private var mPasskey: Passkey? = null
private val mBackupEligibility = PreferencesUtil.isPasskeyBackupEligibilityEnable(this) private var mBackupEligibility: Boolean = true
private val mBackupState = PreferencesUtil.isPasskeyBackupStateEnable(this) private var mBackupState: Boolean = false
private var mPasskeySelectionActivityResultLauncher: ActivityResultLauncher<Intent>? = private var mPasskeySelectionActivityResultLauncher: ActivityResultLauncher<Intent>? =
this.buildActivityResultLauncher( this.buildActivityResultLauncher(
@@ -172,6 +173,12 @@ class PasskeyLauncherActivity : DatabaseModeActivity() {
return false return false
} }
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mBackupEligibility = PreferencesUtil.isPasskeyBackupEligibilityEnable(applicationContext)
mBackupState = PreferencesUtil.isPasskeyBackupStateEnable(applicationContext)
}
private fun cancelRequest() { private fun cancelRequest() {
setResult(RESULT_CANCELED) setResult(RESULT_CANCELED)
finish() finish()

2
app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt
View File

@@ -693,6 +693,8 @@ object PreferencesUtil {
} }
fun isPasskeyBackupStateEnable(context: Context): Boolean { fun isPasskeyBackupStateEnable(context: Context): Boolean {
if (!isPasskeyBackupEligibilityEnable(context))
return false
val prefs = PreferenceManager.getDefaultSharedPreferences(context) val prefs = PreferenceManager.getDefaultSharedPreferences(context)
return prefs.getBoolean(context.getString(R.string.passkeys_backup_state_key), return prefs.getBoolean(context.getString(R.string.passkeys_backup_state_key),
context.resources.getBoolean(R.bool.passkeys_backup_state_default)) context.resources.getBoolean(R.bool.passkeys_backup_state_default))