fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-26 08:27:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

add a flag for determining if an event is repeatable

Browse Source
This commit is contained in:
tibbi 2018-11-15 13:18:04 +01:00
parent 5221f75941
commit f9056061e6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
View File

@ -76,6 +76,7 @@ const val REPEAT_ORDER_WEEKDAY = 4 // i.e. every 4th sunday
// special event flags // special event flags
const val FLAG_ALL_DAY = 1 const val FLAG_ALL_DAY = 1
const val FLAG_IS_PAST_EVENT = 2 const val FLAG_IS_PAST_EVENT = 2
const val FLAG_IS_REPEATABLE = 4
// constants related to ICS file exporting / importing // constants related to ICS file exporting / importing
const val BEGIN_CALENDAR = "BEGIN:VCALENDAR" const val BEGIN_CALENDAR = "BEGIN:VCALENDAR"

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

@ -85,8 +85,8 @@ class EventsHelper(val context: Context) {
return return
} }
val id = eventsDB.insertOrUpdate(event) event.updateIsEventRepeatable()
event.id = id event.id = eventsDB.insertOrUpdate(event)
if (event.repeatInterval != 0 && event.parentId == 0L) { if (event.repeatInterval != 0 && event.parentId == 0L) {
eventRepetitionsDB.insertOrUpdate(event.getEventRepetition()) eventRepetitionsDB.insertOrUpdate(event.getEventRepetition())
@ -109,8 +109,8 @@ class EventsHelper(val context: Context) {
continue continue
} }
val id = eventsDB.insertOrUpdate(event) event.updateIsEventRepeatable()
event.id = id event.id = eventsDB.insertOrUpdate(event)
if (event.repeatInterval != 0 && event.parentId == 0L) { if (event.repeatInterval != 0 && event.parentId == 0L) {
eventRepetitionsDB.insertOrUpdate(event.getEventRepetition()) eventRepetitionsDB.insertOrUpdate(event.getEventRepetition())
@ -127,6 +127,7 @@ class EventsHelper(val context: Context) {
} }
fun updateEvent(activity: Activity? = null, event: Event, updateAtCalDAV: Boolean, callback: (() -> Unit)? = null) { fun updateEvent(activity: Activity? = null, event: Event, updateAtCalDAV: Boolean, callback: (() -> Unit)? = null) {
event.updateIsEventRepeatable()
eventsDB.insertOrUpdate(event) eventsDB.insertOrUpdate(event)
if (event.repeatInterval == 0) { if (event.repeatInterval == 0) {

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/Event.kt
View File

@ -153,6 +153,10 @@ data class Event(
isPastEvent = endTSToCheck < getNowSeconds() isPastEvent = endTSToCheck < getNowSeconds()
} }
fun updateIsEventRepeatable() {
flags = flags.addBitIf(repeatInterval != 0, FLAG_IS_REPEATABLE)
}
var isPastEvent: Boolean var isPastEvent: Boolean
get() = flags and FLAG_IS_PAST_EVENT != 0 get() = flags and FLAG_IS_PAST_EVENT != 0
set(isPastEvent) { set(isPastEvent) {