fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-17 12:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly delete non recurring events when selected together with recurring

Browse Source
This commit is contained in:
tibbi 2018-06-13 19:34:56 +02:00
parent 2133365be4
commit 11b97500ed
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
View File

@ -122,19 +122,23 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
DeleteEventDialog(activity, eventIds, hasRepeatableEvent) { DeleteEventDialog(activity, eventIds, hasRepeatableEvent) {
events.removeAll(eventsToDelete) events.removeAll(eventsToDelete)
val nonRepeatingEventIDs = eventsToDelete.filter { it.repeatInterval == 0 }.map { it.id.toString() }.toTypedArray()
activity.dbHelper.deleteEvents(nonRepeatingEventIDs, true)
val repeatingEventIDs = eventsToDelete.filter { it.repeatInterval != 0 }.map { it.id }
when (it) { when (it) {
DELETE_SELECTED_OCCURRENCE -> { DELETE_SELECTED_OCCURRENCE -> {
eventIds.forEachIndexed { index, value -> repeatingEventIDs.forEachIndexed { index, value ->
activity.dbHelper.addEventRepeatException(value, timestamps[index], true) activity.dbHelper.addEventRepeatException(value, timestamps[index], true)
} }
} }
DELETE_FUTURE_OCCURRENCES -> { DELETE_FUTURE_OCCURRENCES -> {
eventIds.forEachIndexed { index, value -> repeatingEventIDs.forEachIndexed { index, value ->
activity.dbHelper.addEventRepeatLimit(value, timestamps[index]) activity.dbHelper.addEventRepeatLimit(value, timestamps[index])
} }
} }
DELETE_ALL_OCCURRENCES -> { DELETE_ALL_OCCURRENCES -> {
val eventIDs = Array(eventIds.size, { i -> (eventIds[i].toString()) }) val eventIDs = Array(repeatingEventIDs.size, { i -> (repeatingEventIDs[i].toString()) })
activity.dbHelper.deleteEvents(eventIDs, true) activity.dbHelper.deleteEvents(eventIDs, true)
} }
} }

10
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt
View File

@ -216,19 +216,23 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList<ListIt
DeleteEventDialog(activity, eventIds, hasRepeatableEvent) { DeleteEventDialog(activity, eventIds, hasRepeatableEvent) {
listItems.removeAll(eventsToDelete) listItems.removeAll(eventsToDelete)
val nonRepeatingEventIDs = eventsToDelete.filter { !it.isRepeatable }.map { it.id.toString() }.toTypedArray()
activity.dbHelper.deleteEvents(nonRepeatingEventIDs, true)
val repeatingEventIDs = eventsToDelete.filter { it.isRepeatable }.map { it.id }
when (it) { when (it) {
DELETE_SELECTED_OCCURRENCE -> { DELETE_SELECTED_OCCURRENCE -> {
eventIds.forEachIndexed { index, value -> repeatingEventIDs.forEachIndexed { index, value ->
activity.dbHelper.addEventRepeatException(value, timestamps[index], true) activity.dbHelper.addEventRepeatException(value, timestamps[index], true)
} }
} }
DELETE_FUTURE_OCCURRENCES -> { DELETE_FUTURE_OCCURRENCES -> {
eventIds.forEachIndexed { index, value -> repeatingEventIDs.forEachIndexed { index, value ->
activity.dbHelper.addEventRepeatLimit(value, timestamps[index]) activity.dbHelper.addEventRepeatLimit(value, timestamps[index])
} }
} }
DELETE_ALL_OCCURRENCES -> { DELETE_ALL_OCCURRENCES -> {
val eventIDs = Array(eventIds.size, { i -> (eventIds[i].toString()) }) val eventIDs = Array(repeatingEventIDs.size, { i -> (repeatingEventIDs[i].toString()) })
activity.dbHelper.deleteEvents(eventIDs, true) activity.dbHelper.deleteEvents(eventIDs, true)
} }
} }