fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

couple event repetition fixes

Browse Source
This commit is contained in:
tibbi
2017-05-07 23:01:21 +02:00
parent a960e75da9
commit a54a0e2bc3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
View File

@ -399,7 +399,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
private fun getEventsRepeatingTillDateOrForever(fromTS: Int, toTS: Int, startTimes: SparseIntArray, getRunningEvents: Boolean, event: Event): ArrayList<Event> { private fun getEventsRepeatingTillDateOrForever(fromTS: Int, toTS: Int, startTimes: SparseIntArray, getRunningEvents: Boolean, event: Event): ArrayList<Event> {
val events = ArrayList<Event>() val events = ArrayList<Event>()
while (event.startTS <= toTS && (event.repeatLimit == 0 || event.repeatLimit >= event.startTS)) { while (event.startTS <= toTS && (event.repeatLimit == 0 || event.repeatLimit >= event.startTS)) {
if (event.startTS <= toTS && event.endTS >= fromTS) { if (event.endTS >= fromTS) {
if (event.repeatInterval % WEEK == 0) { if (event.repeatInterval % WEEK == 0) {
if (event.startTS.isTsOnProperDay(event)) { if (event.startTS.isTsOnProperDay(event)) {
if (isOnProperWeek(event, startTimes)) { if (isOnProperWeek(event, startTimes)) {
@ -423,16 +423,14 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
if (event.repeatInterval % WEEK == 0) { if (event.repeatInterval % WEEK == 0) {
if (event.startTS.isTsOnProperDay(event)) { if (event.startTS.isTsOnProperDay(event)) {
if (isOnProperWeek(event, startTimes)) { if (isOnProperWeek(event, startTimes)) {
if (event.startTS >= fromTS) { if (event.endTS >= fromTS) {
events.add(event.copy()) events.add(event.copy())
} }
event.repeatLimit++ event.repeatLimit++
} }
} }
} else { } else {
if (event.startTS <= toTS) { events.add(event.copy())
events.add(event.copy())
}
event.repeatLimit++ event.repeatLimit++
} }
event.addIntervalTime() event.addIntervalTime()