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

remove some redundant endTS checks

This commit is contained in:
tibbi 2017-05-07 22:55:25 +02:00
parent 5fc1d1fac8
commit a960e75da9
1 changed files with 3 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/helpers/DBHelper.kt
View File

@ -409,7 +409,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} else { } else {
events.add(event.copy()) events.add(event.copy())
} }
} else if (getRunningEvents && (event.startTS <= fromTS && event.endTS >= toTS)) { } else if (getRunningEvents && (event.startTS <= fromTS)) {
events.add(event.copy()) events.add(event.copy())
} }
event.addIntervalTime() event.addIntervalTime()
@ -423,14 +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 && event.startTS < toTS) { if (event.startTS >= fromTS) {
events.add(event.copy()) events.add(event.copy())
} }
event.repeatLimit++ event.repeatLimit++
} }
} }
} else { } else {
if (event.startTS <= toTS && event.endTS >= fromTS) { if (event.startTS <= toTS) {
events.add(event.copy()) events.add(event.copy())
} }
event.repeatLimit++ event.repeatLimit++