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

fix #324, properly import events with descriptions stretching to multiple lines

This commit is contained in:
tibbi 2018-01-27 15:29:38 +01:00
parent 00ae743900
commit 5dcfe69df1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ class IcsImporter(val activity: SimpleActivity) {
private var curCategoryColor = -2 private var curCategoryColor = -2
private var isNotificationDescription = false private var isNotificationDescription = false
private var isProperReminderAction = false private var isProperReminderAction = false
private var isDescription = false
private var curReminderTriggerMinutes = -1 private var curReminderTriggerMinutes = -1
private var eventsImported = 0 private var eventsImported = 0
@ -62,6 +63,14 @@ class IcsImporter(val activity: SimpleActivity) {
eventsFailed-- eventsFailed--
} }
if (isDescription) {
if (line.startsWith('\t')) {
curDescription += line.trimStart('\t').replace("\\n", "\n")
} else {
isDescription = false
}
}
if (line == BEGIN_EVENT) { if (line == BEGIN_EVENT) {
resetValues() resetValues()
curEventType = defaultEventType curEventType = defaultEventType
@ -77,6 +86,7 @@ class IcsImporter(val activity: SimpleActivity) {
curTitle = getTitle(curTitle).replace("\\n", "\n") curTitle = getTitle(curTitle).replace("\\n", "\n")
} else if (line.startsWith(DESCRIPTION) && !isNotificationDescription) { } else if (line.startsWith(DESCRIPTION) && !isNotificationDescription) {
curDescription = line.substring(DESCRIPTION.length).replace("\\n", "\n") curDescription = line.substring(DESCRIPTION.length).replace("\\n", "\n")
isDescription = true
} else if (line.startsWith(UID)) { } else if (line.startsWith(UID)) {
curImportId = line.substring(UID.length).trim() curImportId = line.substring(UID.length).trim()
} else if (line.startsWith(RRULE)) { } else if (line.startsWith(RRULE)) {