mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2026-11-20 09:01:33 -08:00
fix: Better keygenerator password field implementation
This commit is contained in:
3 files changed
+9
-9
No files matched your search
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -42,6 +42,8 @@ class EntryEditViewModel: NodeEditViewModel() {
|
||||
private set
|
||||
private val mTempAttachments = mutableListOf<EntryAttachmentState>()
|
||||
|
||||
var passwordField: Field? = null
|
||||
|
||||
// To show dialog only one time
|
||||
var backPressedAlreadyApproved = false
|
||||
|
||||
@@ -59,8 +61,8 @@ class EntryEditViewModel: NodeEditViewModel() {
|
||||
val onTemplateChanged : LiveData<Template> get() = _onTemplateChanged
|
||||
private val _onTemplateChanged = MutableLiveData<Template>()
|
||||
|
||||
val requestPasswordSelection : LiveData<Field> get() = _requestPasswordSelection
|
||||
private val _requestPasswordSelection = SingleLiveEvent<Field>()
|
||||
val requestPasswordSelection : LiveData<Void?> get() = _requestPasswordSelection
|
||||
private val _requestPasswordSelection = SingleLiveEvent<Void?>()
|
||||
val onPasswordSelected : LiveData<Field> get() = _onPasswordSelected
|
||||
private val _onPasswordSelected = SingleLiveEvent<Field>()
|
||||
|
||||
@@ -303,7 +305,8 @@ class EntryEditViewModel: NodeEditViewModel() {
|
||||
}
|
||||
|
||||
fun requestPasswordSelection(passwordField: Field) {
|
||||
_requestPasswordSelection.value = passwordField
|
||||
this.passwordField = passwordField
|
||||
_requestPasswordSelection.call()
|
||||
}
|
||||
|
||||
fun selectPassword(passwordField: Field) {
|
||||
|
||||
Reference in new issue
Block a user