fix: Small changes #2541

This commit is contained in:
J-Jamet committed 2026-05-30 17:15:18 +02:00
1 parent bfc061fb4f
commit b80942fab2
2 files changed
+28 -35

No files matched your search

@@ -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()
@@ -128,8 +128,11 @@ class GroupViewModel(application: Application): AndroidViewModel(application) {
private val _requestOpenEntry = MutableSharedFlow<EntryInfo>(replay = 0)
val requestOpenEntry: SharedFlow<EntryInfo> = _requestOpenEntry.asSharedFlow()
private val _requestEditNode = MutableSharedFlow<NodeInfo>(replay = 0)
val requestEditNode: SharedFlow<NodeInfo> = _requestEditNode.asSharedFlow()
private val _requestEditGroup = MutableSharedFlow<GroupInfo>(replay = 0)
val requestEditGroup: SharedFlow<GroupInfo> = _requestEditGroup.asSharedFlow()
private val _requestEditEntry = MutableSharedFlow<EntryInfo>(replay = 0)
val requestEditEntry: SharedFlow<EntryInfo> = _requestEditEntry.asSharedFlow()
private val _requestCopyNodes = MutableSharedFlow<Nodes>(replay = 0)
val requestCopyNodes: SharedFlow<Nodes> = _requestCopyNodes.asSharedFlow()
@@ -152,9 +155,6 @@ class GroupViewModel(application: Application): AndroidViewModel(application) {
private val _requestShowGroup = MutableSharedFlow<GroupInfo>(replay = 0)
val requestShowGroup: SharedFlow<GroupInfo> = _requestShowGroup.asSharedFlow()
private val _requestUpdateGroup = MutableSharedFlow<GroupInfo>(replay = 0)
val requestUpdateGroup: SharedFlow<GroupInfo> = _requestUpdateGroup.asSharedFlow()
private val _showKeyboard = MutableSharedFlow<Boolean>(replay = 0)
val showKeyboard: SharedFlow<Boolean> = _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)
}
}
}