From 579bc8bb666a857ba3da705115d848840e3482e6 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sun, 15 Jan 2023 00:10:07 +0530
Subject: [PATCH] Use UUID for tasks too

---
 .../calendar/pro/activities/TaskActivity.kt            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
index 338ab3fe7..ac37dc165 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
@@ -351,6 +351,11 @@ class TaskActivity : SimpleActivity() {
         }
 
         val wasRepeatable = mTask.repeatInterval > 0
+        val newImportId = if (mTask.id != null) {
+            mTask.importId
+        } else {
+            UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis().toString()
+        }
 
         val reminders = getReminders()
         if (!task_all_day.isChecked) {
@@ -393,6 +398,7 @@ class TaskActivity : SimpleActivity() {
                     updateTaskCompletion(copy(startTS = mOriginalStartTS), true)
                 }
             }
+            importId = newImportId
             flags = mTask.flags.addBitIf(task_all_day.isChecked, FLAG_ALL_DAY)
             lastUpdated = System.currentTimeMillis()
             eventType = mEventTypeId
@@ -458,7 +464,7 @@ class TaskActivity : SimpleActivity() {
             when (it) {
                 0 -> {
                     ensureBackgroundThread {
-                        eventsHelper.addEventRepetitionException(mTask.id!!, mTaskOccurrenceTS, true)
+                        eventsHelper.addEventRepetitionException(mTask.id!!, mTaskOccurrenceTS, addToCalDAV = false)
                         mTask.apply {
                             parentId = id!!.toLong()
                             id = null
@@ -610,7 +616,6 @@ class TaskActivity : SimpleActivity() {
         }
     }
 
-
     private fun updateDateText() {
         task_date.text = Formatter.getDate(this, mTaskDateTime)
     }
@@ -766,7 +771,6 @@ class TaskActivity : SimpleActivity() {
         }
     }
 
-
     private fun showRepeatIntervalDialog() {
         showEventRepeatIntervalDialog(mRepeatInterval) {
             setRepeatInterval(it)