diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt index a442ba033..047be8a6b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt @@ -134,7 +134,13 @@ class IcsImporter(val activity: SimpleActivity) { value = value.substring(0, value.length - 1) } - curRepeatExceptions.add(Formatter.getDayCodeFromTS(getTimestamp(value))) + if (value.contains(",")) { + value.split(",").forEach { exdate -> + curRepeatExceptions.add(Formatter.getDayCodeFromTS(getTimestamp(exdate))) + } + } else { + curRepeatExceptions.add(Formatter.getDayCodeFromTS(getTimestamp(value))) + } } else if (line.startsWith(LOCATION)) { curLocation = getLocation(line.substring(LOCATION.length).replace("\\,", ",")) if (curLocation.trim().isEmpty()) { @@ -247,17 +253,19 @@ class IcsImporter(val activity: SimpleActivity) { private fun getTimestamp(fullString: String): Long { return try { - if (fullString.startsWith(';')) { - val value = fullString.substring(fullString.lastIndexOf(':') + 1).replace(" ", "") - if (value.isEmpty()) { - return 0 - } else if (!value.contains("T")) { - curFlags = curFlags or FLAG_ALL_DAY - } + when { + fullString.startsWith(';') -> { + val value = fullString.substring(fullString.lastIndexOf(':') + 1).replace(" ", "") + if (value.isEmpty()) { + return 0 + } else if (!value.contains("T")) { + curFlags = curFlags or FLAG_ALL_DAY + } - Parser().parseDateTimeValue(value) - } else { - Parser().parseDateTimeValue(fullString.substring(1)) + Parser().parseDateTimeValue(value) + } + fullString.startsWith(":") -> Parser().parseDateTimeValue(fullString.substring(1)) + else -> Parser().parseDateTimeValue(fullString) } } catch (e: Exception) { activity.showErrorToast(e)