From 81a8df530e128eff4a008f7342d2f43c33e28c83 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 17 Apr 2020 18:25:36 +0200 Subject: [PATCH] fix #1077, fixing some ics importing related glitches --- .../calendar/pro/helpers/IcsImporter.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 7bf358760..31ff3a369 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 @@ -1,6 +1,5 @@ package com.simplemobiletools.calendar.pro.helpers -import android.widget.Toast import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.activities.SimpleActivity import com.simplemobiletools.calendar.pro.extensions.eventsDB @@ -110,7 +109,7 @@ class IcsImporter(val activity: SimpleActivity) { curImportId = line.substring(UID.length).trim() } else if (line.startsWith(RRULE)) { curRrule = line.substring(RRULE.length) - // some RRULRs need to know the events start datetime. If it's yet unknown, postpone RRULE parsing + // some RRULEs need to know the events start datetime. If it's yet unknown, postpone RRULE parsing if (curStart != -1L) { parseRepeatRule() } @@ -227,7 +226,7 @@ class IcsImporter(val activity: SimpleActivity) { eventsHelper.insertEvents(eventsToInsert, true) } catch (e: Exception) { - activity.showErrorToast(e, Toast.LENGTH_LONG) + activity.showErrorToast(e) eventsFailed++ } @@ -248,7 +247,9 @@ class IcsImporter(val activity: SimpleActivity) { return try { if (fullString.startsWith(';')) { val value = fullString.substring(fullString.lastIndexOf(':') + 1).replace(" ", "") - if (!value.contains("T")) { + if (value.isEmpty()) { + return 0 + } else if (!value.contains("T")) { curFlags = curFlags or FLAG_ALL_DAY } @@ -257,7 +258,7 @@ class IcsImporter(val activity: SimpleActivity) { Parser().parseDateTimeValue(fullString.substring(1)) } } catch (e: Exception) { - activity.showErrorToast(e, Toast.LENGTH_LONG) + activity.showErrorToast(e) eventsFailed++ -1 }