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 a45e7f219..34a347cfb 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt @@ -112,7 +112,12 @@ class EntryEditViewModel: NodeEditViewModel() { viewModelScope.launch { // Just to compensate TemplateView bug mTemplates?.let { templates -> - _entryEditUIState.update { it.copy(templates = templates) } + _entryEditUIState.update { + it.copy( + loaded = false, + templates = templates + ) + } } withContext(Dispatchers.IO) { mDatabase?.let { database -> @@ -146,7 +151,9 @@ class EntryEditViewModel: NodeEditViewModel() { if (!initialized) { initialized = true entryInfo?.let { - _entryEditEvents.emit(EntryEditEvent.EntryLoaded(entryInfo)) + withContext(Dispatchers.Main) { + _entryEditEvents.emit(EntryEditEvent.EntryLoaded(entryInfo)) + } } } val selectedTemplate = entryInfo?.template ?: Template.STANDARD @@ -155,13 +162,15 @@ class EntryEditViewModel: NodeEditViewModel() { defaultTemplate = selectedTemplate ) mTemplates = templates - _entryEditEvents.emit(EntryEditEvent.OnTemplateChanged(selectedTemplate)) - _entryEditUIState.update { entryEdit -> - entryEdit.copy( - loaded = true, - entryInfo = entryInfo, - templates = templates - ) + withContext(Dispatchers.Main) { + _entryEditEvents.emit(EntryEditEvent.OnTemplateChanged(selectedTemplate)) + _entryEditUIState.update { entryEdit -> + entryEdit.copy( + loaded = true, + entryInfo = entryInfo, + templates = templates + ) + } } } 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 05edf1e44..c19bb2172 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt @@ -149,12 +149,10 @@ class GroupViewModel(application: Application): AndroidViewModel(application) { ) { viewModelScope.launch { mDatabase?.let { database -> + _groupUIState.update { groupState -> + groupState.copy(loaded = false) + } withContext(Dispatchers.IO) { - withContext(Dispatchers.Main) { - _groupUIState.update { groupState -> - groupState.copy(loaded = false) - } - } val groupId = groupState?.groupId val showFromPosition = groupState?.firstVisibleItem val group = if (groupId != null) {