From a960e75da97900f8e0624ee89af7a63bc15f7db3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 7 May 2017 22:55:25 +0200 Subject: [PATCH] remove some redundant endTS checks --- .../com/simplemobiletools/calendar/helpers/DBHelper.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt index 167e6a4b1..f81136a0f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -409,7 +409,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont } else { events.add(event.copy()) } - } else if (getRunningEvents && (event.startTS <= fromTS && event.endTS >= toTS)) { + } else if (getRunningEvents && (event.startTS <= fromTS)) { events.add(event.copy()) } event.addIntervalTime() @@ -423,14 +423,14 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont if (event.repeatInterval % WEEK == 0) { if (event.startTS.isTsOnProperDay(event)) { if (isOnProperWeek(event, startTimes)) { - if (event.startTS >= fromTS && event.startTS < toTS) { + if (event.startTS >= fromTS) { events.add(event.copy()) } event.repeatLimit++ } } } else { - if (event.startTS <= toTS && event.endTS >= fromTS) { + if (event.startTS <= toTS) { events.add(event.copy()) } event.repeatLimit++