diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index d8a7d1bb2..7cd8fbac5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -144,10 +144,9 @@ class EntryEditActivity : DatabaseLockActivity(), mEntryEditViewModel.selectIcon(icon) } - private var mPasswordField: Field? = null private var mKeyGeneratorResultLauncher = KeyGeneratorActivity.registerForGeneratedKeyResult(this) { keyGenerated -> keyGenerated?.let { - mPasswordField?.let { + mEntryEditViewModel.passwordField?.let { it.protectedValue = ProtectedString( it.protectedValue.isProtected, keyGenerated @@ -156,7 +155,7 @@ class EntryEditActivity : DatabaseLockActivity(), keyGenerated.clear() } } - mPasswordField = null + mEntryEditViewModel.passwordField = null Handler(Looper.getMainLooper()).post { performedNextEducation() } @@ -318,8 +317,7 @@ class EntryEditActivity : DatabaseLockActivity(), } } - mEntryEditViewModel.requestPasswordSelection.observe(this) { passwordField -> - mPasswordField = passwordField + mEntryEditViewModel.requestPasswordSelection.observe(this) { KeyGeneratorActivity.launch(this, mKeyGeneratorResultLauncher) } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt index 00fa7879b..7d1974a2f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt @@ -123,7 +123,6 @@ class KeyGeneratorActivity : DatabaseLockActivity() { return activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> if (result.resultCode == RESULT_OK) { keyGeneratedListener.invoke( - //TODO TransientStorage result.data?.getCharArrayExtra(KEY_GENERATED) ) } else { diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt index 85c7223dc..ff32b6ee1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt @@ -42,6 +42,8 @@ class EntryEditViewModel: NodeEditViewModel() { private set private val mTempAttachments = mutableListOf() + var passwordField: Field? = null + // To show dialog only one time var backPressedAlreadyApproved = false @@ -59,8 +61,8 @@ class EntryEditViewModel: NodeEditViewModel() { val onTemplateChanged : LiveData