diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index eb4fc963a..2530da62f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -536,7 +536,6 @@ class GroupActivity : DatabaseLockActivity() { } } launch { - // TODO In View Model mGroupViewModel.requestOpenEntry.collect { entry -> mDatabase?.let { database -> EntrySelectionHelper.doSpecialAction( @@ -619,27 +618,25 @@ class GroupActivity : DatabaseLockActivity() { } } launch { - mGroupViewModel.requestEditNode.collect { node -> - when (node) { - is GroupInfo -> { - launchDialogForGroupUpdate(node) - } - is EntryInfo -> { - mDatabase?.let { database -> - val entryId = node.nodeId - if (mDatabaseAllowUserVerification) { - checkUserVerification( - userVerificationViewModel = mUserVerificationViewModel, - dataToVerify = UserVerificationData( - actionType = UserVerificationActionType.EDIT_ENTRY, - database = database, - entryId = entryId - ) - ) - } else { - editEntry(database, entryId) - } - } + mGroupViewModel.requestEditGroup.collect { group -> + launchDialogForGroupUpdate(group) + } + } + launch { + mGroupViewModel.requestEditEntry.collect { entry -> + mDatabase?.let { database -> + val entryId = entry.nodeId + if (mDatabaseAllowUserVerification) { + checkUserVerification( + userVerificationViewModel = mUserVerificationViewModel, + dataToVerify = UserVerificationData( + actionType = UserVerificationActionType.EDIT_ENTRY, + database = database, + entryId = entryId + ) + ) + } else { + editEntry(database, entryId) } } } @@ -649,11 +646,6 @@ class GroupActivity : DatabaseLockActivity() { launchDialogToShowGroupInfo(group) } } - launch { - mGroupViewModel.requestUpdateGroup.collect { group -> - launchDialogForGroupUpdate(group) - } - } launch { mGroupViewModel.requestCopyNodes.collect { removeSearch() diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt index ac4ed307a..6ffdb869f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt @@ -128,8 +128,11 @@ class GroupViewModel(application: Application): AndroidViewModel(application) { private val _requestOpenEntry = MutableSharedFlow(replay = 0) val requestOpenEntry: SharedFlow = _requestOpenEntry.asSharedFlow() - private val _requestEditNode = MutableSharedFlow(replay = 0) - val requestEditNode: SharedFlow = _requestEditNode.asSharedFlow() + private val _requestEditGroup = MutableSharedFlow(replay = 0) + val requestEditGroup: SharedFlow = _requestEditGroup.asSharedFlow() + + private val _requestEditEntry = MutableSharedFlow(replay = 0) + val requestEditEntry: SharedFlow = _requestEditEntry.asSharedFlow() private val _requestCopyNodes = MutableSharedFlow(replay = 0) val requestCopyNodes: SharedFlow = _requestCopyNodes.asSharedFlow() @@ -152,9 +155,6 @@ class GroupViewModel(application: Application): AndroidViewModel(application) { private val _requestShowGroup = MutableSharedFlow(replay = 0) val requestShowGroup: SharedFlow = _requestShowGroup.asSharedFlow() - private val _requestUpdateGroup = MutableSharedFlow(replay = 0) - val requestUpdateGroup: SharedFlow = _requestUpdateGroup.asSharedFlow() - private val _showKeyboard = MutableSharedFlow(replay = 0) val showKeyboard: SharedFlow = _showKeyboard.asSharedFlow() @@ -444,7 +444,7 @@ class GroupViewModel(application: Application): AndroidViewModel(application) { || mDatabase?.rootGroupIsVirtual != true) ) { finishNodeAction() - _requestUpdateGroup.emit(currentGroup) + _requestEditGroup.emit(currentGroup) } else { onBreadcrumbClicked(node) } @@ -525,8 +525,9 @@ class GroupViewModel(application: Application): AndroidViewModel(application) { if (nodes.isNotEmpty()) { finishNodeAction() viewModelScope.launch { - (nodes[0] as? NodeInfo)?.let { - _requestEditNode.emit(it) + when (val node = nodes[0]) { + is GroupInfo -> _requestEditGroup.emit(node) + is EntryInfo -> _requestEditEntry.emit(node) } } }