From 7941373a372a583a015ee4f90f1b02b8f501bcec Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 10 Mar 2022 15:15:11 -0600 Subject: [PATCH] Fix reminder synchronization Remote changes were being ignored if local reminders were present --- app/src/main/java/org/tasks/caldav/iCalendar.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/tasks/caldav/iCalendar.kt b/app/src/main/java/org/tasks/caldav/iCalendar.kt index 571aa1231..ea55a9b8f 100644 --- a/app/src/main/java/org/tasks/caldav/iCalendar.kt +++ b/app/src/main/java/org/tasks/caldav/iCalendar.kt @@ -201,7 +201,10 @@ class iCalendar @Inject constructor( tagDao.applyTags(task, tagDataDao, getTags(remote.categories)) } - val alarms = alarmDao.getAlarms(task.id) + val alarms = alarmDao.getAlarms(task.id).onEach { + it.id = 0 + it.task = 0 + } val randomReminders = alarms.filter { it.type == TYPE_RANDOM } val localReminders = local?.reminders?.plus(randomReminders) ?: randomReminders