From 7985112082ae6ac420802dbf797d649c30b21014 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 18 Nov 2018 17:03:44 +0100
Subject: [PATCH] fix some glitches related to duplicating events

---
 .../calendar/pro/activities/EventActivity.kt                | 6 +++---
 .../simplemobiletools/calendar/pro/helpers/EventsHelper.kt  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index 6518c9c00..f56106b01 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -95,10 +95,10 @@ class EventActivity : SimpleActivity() {
             }
 
             if (intent.getBooleanExtra(IS_DUPLICATE_INTENT, false)) {
-                mEvent.id = 0
+                mEvent.id = null
+            } else {
+                cancelNotification(mEvent.id!!)
             }
-
-            cancelNotification(mEvent.id!!)
         } else {
             mEvent = Event(null)
             config.apply {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
index de40dcd70..f10d856b1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
@@ -128,6 +128,10 @@ class EventsHelper(val context: Context) {
     fun deleteEvent(id: Long, deleteFromCalDAV: Boolean) = deleteEvents(arrayListOf(id), deleteFromCalDAV)
 
     fun deleteEvents(ids: MutableList<Long>, deleteFromCalDAV: Boolean) {
+        if (ids.isEmpty()) {
+            return
+        }
+
         val eventsWithImportId = eventsDB.getEventsByIdsWithImportIds(ids)
         eventsDB.deleteEvents(ids)