From a54a0e2bc3c19051b8ea652fcd41e79118cb4d98 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 7 May 2017 23:01:21 +0200
Subject: [PATCH] couple event repetition fixes

---
 .../com/simplemobiletools/calendar/helpers/DBHelper.kt    | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 f81136a0f..41b928a9e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
@@ -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> {
         val events = ArrayList<Event>()
         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.startTS.isTsOnProperDay(event)) {
                         if (isOnProperWeek(event, startTimes)) {
@@ -423,16 +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) {
+                        if (event.endTS >= fromTS) {
                             events.add(event.copy())
                         }
                         event.repeatLimit++
                     }
                 }
             } else {
-                if (event.startTS <= toTS) {
-                    events.add(event.copy())
-                }
+                events.add(event.copy())
                 event.repeatLimit++
             }
             event.addIntervalTime()