Check if original attachments are initialized

pull/1975/head
Alex Baker 3 years ago
parent 8dd47881a2
commit bf829727ff

@ -77,6 +77,7 @@ open class BaseTaskEditViewModelTest : InjectingTestCase() {
MutableSharedFlow(), MutableSharedFlow(),
userActivityDao = userActivityDao, userActivityDao = userActivityDao,
taskAttachmentDao = db.taskAttachmentDao, taskAttachmentDao = db.taskAttachmentDao,
alarmDao = db.alarmDao,
) )
} }

@ -206,7 +206,8 @@ class TaskEditViewModel @Inject constructor(
originalList != selectedList.value || originalList != selectedList.value ||
originalLocation != selectedLocation.value || originalLocation != selectedLocation.value ||
originalTags.toHashSet() != selectedTags.value.toHashSet() || originalTags.toHashSet() != selectedTags.value.toHashSet() ||
originalAttachments.toHashSet() != selectedAttachments.value.toHashSet() || (::originalAttachments.isInitialized &&
originalAttachments.toHashSet() != selectedAttachments.value.toHashSet()) ||
newSubtasks.value.isNotEmpty() || newSubtasks.value.isNotEmpty() ||
getRingFlags() != when { getRingFlags() != when {
task.isNotifyModeFive -> NOTIFY_MODE_FIVE task.isNotifyModeFive -> NOTIFY_MODE_FIVE
@ -324,7 +325,10 @@ class TaskEditViewModel @Inject constructor(
task.modificationDate = now() task.modificationDate = now()
} }
if (selectedAttachments.value.toHashSet() != originalAttachments.toHashSet()) { if (
this@TaskEditViewModel::originalAttachments.isInitialized &&
selectedAttachments.value.toHashSet() != originalAttachments.toHashSet()
) {
originalAttachments originalAttachments
.minus(selectedAttachments.value.toSet()) .minus(selectedAttachments.value.toSet())
.map { it.remoteId } .map { it.remoteId }
@ -445,8 +449,10 @@ class TaskEditViewModel @Inject constructor(
init { init {
viewModelScope.launch { viewModelScope.launch {
originalAttachments = taskAttachmentDao.getAttachments(task.id) taskAttachmentDao.getAttachments(task.id).let { attachments ->
selectedAttachments.update { originalAttachments } selectedAttachments.update { attachments }
originalAttachments = attachments
}
} }
} }

Loading…
Cancel
Save