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

properly import ics reminders if TRIGGER and ACTION are flipped

This commit is contained in:
tibbi 2017-10-30 10:01:06 +01:00
parent 2179ecd5e3
commit 0adc7525ff
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt
View File

@ -31,7 +31,8 @@ class IcsImporter {
private var curLastModified = 0L private var curLastModified = 0L
private var curLocation = "" private var curLocation = ""
private var isNotificationDescription = false private var isNotificationDescription = false
private var lastReminderAction = "" private var isProperReminderAction = false
private var curReminderTriggerMinutes = -1
private var eventsImported = 0 private var eventsImported = 0
private var eventsFailed = 0 private var eventsFailed = 0
@ -82,10 +83,9 @@ class IcsImporter {
curRepeatLimit = repeatRule.repeatLimit curRepeatLimit = repeatRule.repeatLimit
} else if (line.startsWith(ACTION)) { } else if (line.startsWith(ACTION)) {
isNotificationDescription = true isNotificationDescription = true
lastReminderAction = line.substring(ACTION.length) isProperReminderAction = line.substring(ACTION.length) == DISPLAY
} else if (line.startsWith(TRIGGER)) { } else if (line.startsWith(TRIGGER)) {
if (lastReminderAction == DISPLAY) curReminderTriggerMinutes = Parser().parseDurationSeconds(line.substring(TRIGGER.length)) / 60
curReminderMinutes.add(Parser().parseDurationSeconds(line.substring(TRIGGER.length)) / 60)
} else if (line.startsWith(CATEGORIES)) { } else if (line.startsWith(CATEGORIES)) {
val categories = line.substring(CATEGORIES.length) val categories = line.substring(CATEGORIES.length)
tryAddCategories(categories, activity) tryAddCategories(categories, activity)
@ -95,6 +95,10 @@ class IcsImporter {
curRepeatExceptions.add(getTimestamp(line.substring(EXDATE.length))) curRepeatExceptions.add(getTimestamp(line.substring(EXDATE.length)))
} else if (line.startsWith(LOCATION)) { } else if (line.startsWith(LOCATION)) {
curLocation = line.substring(LOCATION.length) curLocation = line.substring(LOCATION.length)
} else if (line == END_ALARM) {
if (isProperReminderAction && curReminderTriggerMinutes != -1) {
curReminderMinutes.add(curReminderTriggerMinutes)
}
} else if (line == END_EVENT) { } else if (line == END_EVENT) {
if (curStart != -1 && curEnd == -1) if (curStart != -1 && curEnd == -1)
curEnd = curStart curEnd = curStart
@ -202,6 +206,7 @@ class IcsImporter {
curLastModified = 0L curLastModified = 0L
curLocation = "" curLocation = ""
isNotificationDescription = false isNotificationDescription = false
lastReminderAction = "" isProperReminderAction = false
curReminderTriggerMinutes = -1
} }
} }