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

fix #1011, improve the handling of events repeating every 14 days or so

Browse Source
This commit is contained in:
tibbi
2019-11-17 10:38:58 +01:00
parent f8aae5e34d
commit ae3c2351ae
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import com.simplemobiletools.calendar.pro.extensions.isXYearlyRepetition
import com.simplemobiletools.calendar.pro.extensions.seconds import com.simplemobiletools.calendar.pro.extensions.seconds
import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.calendar.pro.models.Event
import com.simplemobiletools.calendar.pro.models.EventRepetition import com.simplemobiletools.calendar.pro.models.EventRepetition
import com.simplemobiletools.commons.extensions.areDigitsOnly
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.*
import org.joda.time.DateTimeZone import org.joda.time.DateTimeZone
import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormat
@@ -29,6 +30,13 @@ class Parser {
repeatRule = Math.pow(2.0, (start.dayOfWeek - 1).toDouble()).toInt() repeatRule = Math.pow(2.0, (start.dayOfWeek - 1).toDouble()).toInt()
} else if (value == MONTHLY || value == YEARLY) { } else if (value == MONTHLY || value == YEARLY) {
repeatRule = REPEAT_SAME_DAY repeatRule = REPEAT_SAME_DAY
} else if (value == DAILY && fullString.contains(INTERVAL)) {
val interval = fullString.substringAfter("$INTERVAL=").substringBefore(";")
// properly handle events repeating by 14 days or so, just add a repeat rule to specify a day of the week
if (interval.areDigitsOnly() && interval.toInt() % 7 == 0) {
val dateTime = Formatter.getDateTimeFromTS(startTS)
repeatRule = Math.pow(2.0, (dateTime.dayOfWeek - 1).toDouble()).toInt()
}
} }
} else if (key == COUNT) { } else if (key == COUNT) {
repeatLimit = -value.toLong() repeatLimit = -value.toLong()