fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some glitches related to duplicating events

This commit is contained in:
tibbi 2018-11-18 17:03:44 +01:00
parent 7f36b62798
commit 7985112082
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View File

@ -95,10 +95,10 @@ class EventActivity : SimpleActivity() {
} }
if (intent.getBooleanExtra(IS_DUPLICATE_INTENT, false)) { if (intent.getBooleanExtra(IS_DUPLICATE_INTENT, false)) {
mEvent.id = 0 mEvent.id = null
} else {
cancelNotification(mEvent.id!!)
} }
cancelNotification(mEvent.id!!)
} else { } else {
mEvent = Event(null) mEvent = Event(null)
config.apply { config.apply {

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
View File

@ -128,6 +128,10 @@ class EventsHelper(val context: Context) {
fun deleteEvent(id: Long, deleteFromCalDAV: Boolean) = deleteEvents(arrayListOf(id), deleteFromCalDAV) fun deleteEvent(id: Long, deleteFromCalDAV: Boolean) = deleteEvents(arrayListOf(id), deleteFromCalDAV)
fun deleteEvents(ids: MutableList<Long>, deleteFromCalDAV: Boolean) { fun deleteEvents(ids: MutableList<Long>, deleteFromCalDAV: Boolean) {
if (ids.isEmpty()) {
return
}
val eventsWithImportId = eventsDB.getEventsByIdsWithImportIds(ids) val eventsWithImportId = eventsDB.getEventsByIdsWithImportIds(ids)
eventsDB.deleteEvents(ids) eventsDB.deleteEvents(ids)