Merge pull request #1800 from Naveen3Singh/caldav_duplication

Fix event duplication issues
2025-06-05 21:59:17 +02:00 · 2022-08-09 10:11:38 +02:00
parent e9db75e6c3 65c15d97b6
commit bdcd609b02
53 changed files with 179 additions and 50 deletions
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
@@ -38,7 +38,6 @@ import com.simplemobiletools.calendar.pro.helpers.IcsExporter.ExportResult
 import com.simplemobiletools.calendar.pro.helpers.IcsImporter.ImportResult
 import com.simplemobiletools.calendar.pro.jobs.CalDAVUpdateListener
 import com.simplemobiletools.calendar.pro.models.Event
-import com.simplemobiletools.calendar.pro.models.EventType
 import com.simplemobiletools.calendar.pro.models.ListEvent
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
@@ -593,10 +592,9 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
                toast(R.string.importing)
                ensureBackgroundThread {
                    val holidays = getString(R.string.holidays)
-                    var eventTypeId = eventsHelper.getEventTypeIdWithTitle(holidays)
+                    var eventTypeId = eventsHelper.getEventTypeIdWithClass(HOLIDAY_EVENT)
                    if (eventTypeId == -1L) {
-                        val eventType = EventType(null, holidays, resources.getColor(R.color.default_holidays_color))
-                        eventTypeId = eventsHelper.insertOrUpdateEventTypeSync(eventType)
+                        eventTypeId = eventsHelper.createPredefinedEventType(holidays, R.color.default_holidays_color, HOLIDAY_EVENT, true)
                    }
                    val result = IcsImporter(this).importEvents(selectedHoliday as String, eventTypeId, 0, false, reminders)
                    handleParseResult(result)
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/databases/EventsDatabase.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/databases/EventsDatabase.kt
@@ -22,7 +22,7 @@ import com.simplemobiletools.calendar.pro.models.Widget
 import com.simplemobiletools.commons.extensions.getProperPrimaryColor
 import java.util.concurrent.Executors

-@Database(entities = [Event::class, EventType::class, Widget::class, Task::class], version = 7)
+@Database(entities = [Event::class, EventType::class, Widget::class, Task::class], version = 8)
@TypeConverters(Converters::class)
 abstract class EventsDatabase : RoomDatabase() {

@@ -54,6 +54,7 @@ abstract class EventsDatabase : RoomDatabase() {
                            .addMigrations(MIGRATION_4_5)
                            .addMigrations(MIGRATION_5_6)
                            .addMigrations(MIGRATION_6_7)
+                            .addMigrations(MIGRATION_7_8)
                            .build()
                        db!!.openHelper.setWriteAheadLoggingEnabled(true)
                    }
@@ -127,5 +128,13 @@ abstract class EventsDatabase : RoomDatabase() {
                }
            }
        }
+
+        private val MIGRATION_7_8 = object : Migration(7, 8) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("ALTER TABLE event_types ADD COLUMN type INTEGER NOT NULL DEFAULT 0")
+                }
+            }
+        }
    }
 }
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditEventTypeDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditEventTypeDialog.kt
@@ -5,6 +5,7 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.calendar.pro.R
 import com.simplemobiletools.calendar.pro.extensions.eventsHelper
+import com.simplemobiletools.calendar.pro.helpers.OTHER_EVENT
 import com.simplemobiletools.calendar.pro.models.EventType
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.extensions.*
@@ -59,10 +60,16 @@ class EditEventTypeDialog(val activity: Activity, var eventType: EventType? = nu
    }

    private fun eventTypeConfirmed(title: String, dialog: AlertDialog) {
-        val eventIdWithTitle = activity.eventsHelper.getEventTypeIdWithTitle(title)
-        var isEventTypeTitleTaken = isNewEvent && eventIdWithTitle != -1L
+        val eventTypeClass = eventType?.type ?: OTHER_EVENT
+        val eventTypeId = if (eventTypeClass == OTHER_EVENT) {
+            activity.eventsHelper.getEventTypeIdWithTitle(title)
+        } else {
+            activity.eventsHelper.getEventTypeIdWithClass(eventTypeClass)
+        }
+
+        var isEventTypeTitleTaken = isNewEvent && eventTypeId != -1L
        if (!isEventTypeTitleTaken) {
-            isEventTypeTitleTaken = !isNewEvent && eventType!!.id != eventIdWithTitle && eventIdWithTitle != -1L
+            isEventTypeTitleTaken = !isNewEvent && eventType!!.id != eventTypeId && eventTypeId != -1L
        }

        if (title.isEmpty()) {
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
@@ -10,6 +10,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Resources
+import android.database.Cursor
 import android.graphics.Bitmap
 import android.media.AudioAttributes
 import android.net.Uri
@@ -677,3 +678,29 @@ fun Context.updateTaskCompletion(event: Event, completed: Boolean) {
    // mark event as "incomplete" in the main events db
    eventsDB.updateTaskCompletion(event.id!!, event.flags.removeBit(FLAG_TASK_COMPLETED))
 }
+
+// same as Context.queryCursor but inlined to allow non-local returns
+inline fun Context.queryCursorInlined(
+    uri: Uri,
+    projection: Array<String>,
+    selection: String? = null,
+    selectionArgs: Array<String>? = null,
+    sortOrder: String? = null,
+    showErrors: Boolean = false,
+    callback: (cursor: Cursor) -> Unit
+) {
+    try {
+        val cursor = contentResolver.query(uri, projection, selection, selectionArgs, sortOrder)
+        cursor?.use {
+            if (cursor.moveToFirst()) {
+                do {
+                    callback(cursor)
+                } while (cursor.moveToNext())
+            }
+        }
+    } catch (e: Exception) {
+        if (showErrors) {
+            showErrorToast(e)
+        }
+    }
+}
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHelper.kt
@@ -6,6 +6,7 @@ import android.content.ContentValues
 import android.content.Context
 import android.provider.CalendarContract.*
 import android.util.SparseIntArray
+import android.widget.Toast
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.simplemobiletools.calendar.pro.R
@@ -13,11 +14,12 @@ import com.simplemobiletools.calendar.pro.extensions.*
 import com.simplemobiletools.calendar.pro.models.*
 import com.simplemobiletools.calendar.pro.objects.States.isUpdatingCalDAV
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.*
+import com.simplemobiletools.commons.helpers.PERMISSION_READ_CALENDAR
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CALENDAR
 import org.joda.time.DateTimeZone
 import org.joda.time.format.DateTimeFormat
 import java.util.*
-import kotlin.collections.ArrayList
+import kotlin.math.max

@SuppressLint("MissingPermission")
 class CalDAVHelper(val context: Context) {
@@ -149,9 +151,12 @@ class CalDAVHelper(val context: Context) {
    private fun fetchCalDAVCalendarEvents(calendarId: Int, eventTypeId: Long, showToasts: Boolean) {
        val importIdsMap = HashMap<String, Event>()
        val fetchedEventIds = ArrayList<String>()
+
+        var errorFetchingLocalEvents = false
        val existingEvents = try {
            context.eventsDB.getEventsFromCalDAVCalendar("$CALDAV-$calendarId")
        } catch (e: Exception) {
+            errorFetchingLocalEvents = true
            ArrayList()
        }

@@ -180,14 +185,20 @@ class CalDAVHelper(val context: Context) {
        )

        val selection = "${Events.CALENDAR_ID} = $calendarId"
-        context.queryCursor(uri, projection, selection, showErrors = showToasts) { cursor ->
+        context.queryCursorInlined(uri, projection, selection, showErrors = showToasts) { cursor ->
            val deleted = cursor.getIntValue(Events.DELETED)
            if (deleted == 1) {
-                return@queryCursor
+                return@queryCursorInlined
            }

            val id = cursor.getLongValue(Events._ID)
            val title = cursor.getStringValue(Events.TITLE) ?: ""
+
+            if (errorFetchingLocalEvents) {
+                context.toast(context.getString(R.string.fetching_event_failed, "\"$title\""), Toast.LENGTH_LONG)
+                return
+            }
+
            val description = cursor.getStringValue(Events.DESCRIPTION) ?: ""
            val startTS = cursor.getLongValue(Events.DTSTART) / 1000L
            var endTS = cursor.getLongValue(Events.DTEND) / 1000L
@@ -238,14 +249,18 @@ class CalDAVHelper(val context: Context) {
                val parentEvent = context.eventsDB.getEventWithImportId(parentImportId)
                val originalDayCode = Formatter.getDayCodeFromTS(originalInstanceTime / 1000L)
                if (parentEvent != null && !parentEvent.repetitionExceptions.contains(originalDayCode)) {
+                    val storedEventId = context.eventsDB.getEventIdWithImportId(importId)
+                    if (storedEventId != null) {
+                        event.id = storedEventId
+                    }
                    event.parentId = parentEvent.id!!
                    parentEvent.addRepetitionException(originalDayCode)
-                    eventsHelper.insertEvent(parentEvent, false, false)
+                    eventsHelper.insertEvent(parentEvent, addToCalDAV = false, showToasts = false)

                    event.parentId = parentEvent.id!!
                    event.addRepetitionException(originalDayCode)
-                    eventsHelper.insertEvent(event, false, false)
-                    return@queryCursor
+                    eventsHelper.insertEvent(event, addToCalDAV = false, showToasts = false)
+                    return@queryCursorInlined
                }
            }

@@ -262,10 +277,10 @@ class CalDAVHelper(val context: Context) {
                            val formatter = DateTimeFormat.forPattern("yyyyMMdd'T'HHmmss'Z'")
                            val offset = DateTimeZone.getDefault().getOffset(System.currentTimeMillis())
                            val dt = formatter.parseDateTime(it).plusMillis(offset)
-                            val daycode = Formatter.getDayCodeFromDateTime(dt)
-                            event.repetitionExceptions.add(daycode)
+                            val dayCode = Formatter.getDayCodeFromDateTime(dt)
+                            event.repetitionExceptions.add(dayCode)
                        } else {
-                            var potentialTS = it.substring(0, 8)
+                            val potentialTS = it.substring(0, 8)
                            if (potentialTS.areDigitsOnly()) {
                                event.repetitionExceptions.add(potentialTS)
                            }
@@ -287,12 +302,12 @@ class CalDAVHelper(val context: Context) {

                if (existingEvent.hashCode() != event.hashCode() && title.isNotEmpty()) {
                    event.id = originalEventId
-                    eventsHelper.updateEvent(event, false, false)
+                    eventsHelper.updateEvent(event, updateAtCalDAV = false, showToasts = false)
                }
            } else {
                if (title.isNotEmpty()) {
                    importIdsMap[event.importId] = event
-                    eventsHelper.insertEvent(event, false, false)
+                    eventsHelper.insertEvent(event, addToCalDAV = false, showToasts = false)
                }
            }
        }
@@ -300,9 +315,9 @@ class CalDAVHelper(val context: Context) {
        val eventIdsToDelete = ArrayList<Long>()
        importIdsMap.keys.filter { !fetchedEventIds.contains(it) }.forEach {
            val caldavEventId = it
-            existingEvents.forEach {
-                if (it.importId == caldavEventId) {
-                    eventIdsToDelete.add(it.id!!)
+            existingEvents.forEach { event ->
+                if (event.importId == caldavEventId) {
+                    eventIdsToDelete.add(event.id!!)
                }
            }
        }
@@ -428,7 +443,7 @@ class CalDAVHelper(val context: Context) {

    private fun getDurationCode(event: Event): String {
        return if (event.getIsAllDay()) {
-            val dur = Math.max(1, (event.endTS - event.startTS) / DAY)
+            val dur = max(1, (event.endTS - event.startTS) / DAY)
            "P${dur}D"
        } else {
            Parser().getDurationCode((event.endTS - event.startTS) / 60L)
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
@@ -41,6 +41,7 @@ const val REMINDER_DEFAULT_VALUE = "${REMINDER_OFF},${REMINDER_OFF},${REMINDER_O
 const val OTHER_EVENT = 0
 const val BIRTHDAY_EVENT = 1
 const val ANNIVERSARY_EVENT = 2
+const val HOLIDAY_EVENT = 3

 const val ITEM_EVENT = 0
 const val ITEM_SECTION_DAY = 1
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.calendar.pro.helpers
 import android.app.Activity
 import android.content.Context
 import android.widget.Toast
+import androidx.annotation.ColorRes
 import androidx.collection.LongSparseArray
 import com.simplemobiletools.calendar.pro.R
 import com.simplemobiletools.calendar.pro.extensions.*
@@ -76,8 +77,12 @@ class EventsHelper(val context: Context) {

    fun getEventTypeIdWithTitle(title: String) = eventTypesDB.getEventTypeIdWithTitle(title) ?: -1L

+    fun getEventTypeIdWithClass(classId: Int) = eventTypesDB.getEventTypeIdWithClass(classId) ?: -1L
+
    private fun getLocalEventTypeIdWithTitle(title: String) = eventTypesDB.getLocalEventTypeIdWithTitle(title) ?: -1L

+    private fun getLocalEventTypeIdWithClass(classId: Int) = eventTypesDB.getLocalEventTypeIdWithClass(classId) ?: -1L
+
    fun getEventTypeWithCalDAVCalendarId(calendarId: Int) = eventTypesDB.getEventTypeWithCalDAVCalendarId(calendarId)

    fun deleteEventTypes(eventTypes: ArrayList<EventType>, deleteEvents: Boolean) {
@@ -338,22 +343,36 @@ class EventsHelper(val context: Context) {
        callback(events)
    }

+    fun createPredefinedEventType(title: String, @ColorRes colorResId: Int, type: Int, caldav: Boolean = false): Long {
+        val eventType = EventType(id = null, title = title, color = context.resources.getColor(colorResId), type = type)
+
+        // check if the event type already exists but without the type (e.g. BIRTHDAY_EVENT) so as to avoid duplication
+        val originalEventTypeId = if (caldav) {
+            getEventTypeIdWithTitle(title)
+        } else {
+            getLocalEventTypeIdWithTitle(title)
+        }
+        if (originalEventTypeId != -1L) {
+            eventType.id = originalEventTypeId
+        }
+
+        return insertOrUpdateEventTypeSync(eventType)
+    }
+
    fun getLocalBirthdaysEventTypeId(createIfNotExists: Boolean = true): Long {
-        val birthdays = context.getString(R.string.birthdays)
-        var eventTypeId = getLocalEventTypeIdWithTitle(birthdays)
+        var eventTypeId = getLocalEventTypeIdWithClass(BIRTHDAY_EVENT)
        if (eventTypeId == -1L && createIfNotExists) {
-            val eventType = EventType(null, birthdays, context.resources.getColor(R.color.default_birthdays_color))
-            eventTypeId = insertOrUpdateEventTypeSync(eventType)
+            val birthdays = context.getString(R.string.birthdays)
+            eventTypeId = createPredefinedEventType(birthdays, R.color.default_birthdays_color, BIRTHDAY_EVENT)
        }
        return eventTypeId
    }

    fun getAnniversariesEventTypeId(createIfNotExists: Boolean = true): Long {
-        val anniversaries = context.getString(R.string.anniversaries)
-        var eventTypeId = getLocalEventTypeIdWithTitle(anniversaries)
+        var eventTypeId = getLocalEventTypeIdWithClass(ANNIVERSARY_EVENT)
        if (eventTypeId == -1L && createIfNotExists) {
-            val eventType = EventType(null, anniversaries, context.resources.getColor(R.color.default_anniversaries_color))
-            eventTypeId = insertOrUpdateEventTypeSync(eventType)
+            val anniversaries = context.getString(R.string.anniversaries)
+            eventTypeId = createPredefinedEventType(anniversaries, R.color.default_anniversaries_color, ANNIVERSARY_EVENT)
        }
        return eventTypeId
    }
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/EventTypesDao.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/EventTypesDao.kt
@@ -17,6 +17,12 @@ interface EventTypesDao {
    @Query("SELECT id FROM event_types WHERE title = :title AND caldav_calendar_id = 0 COLLATE NOCASE")
    fun getLocalEventTypeIdWithTitle(title: String): Long?

+    @Query("SELECT id FROM event_types WHERE type = :classId")
+    fun getEventTypeIdWithClass(classId: Int): Long?
+
+    @Query("SELECT id FROM event_types WHERE type = :classId AND caldav_calendar_id = 0")
+    fun getLocalEventTypeIdWithClass(classId: Int): Long?
+
    @Query("SELECT * FROM event_types WHERE caldav_calendar_id = :calendarId")
    fun getEventTypeWithCalDAVCalendarId(calendarId: Int): EventType?

--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/EventType.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/EventType.kt
@@ -4,6 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import com.simplemobiletools.calendar.pro.helpers.OTHER_EVENT

@Entity(tableName = "event_types", indices = [(Index(value = ["id"], unique = true))])
 data class EventType(
@@ -12,7 +13,9 @@ data class EventType(
    @ColumnInfo(name = "color") var color: Int,
    @ColumnInfo(name = "caldav_calendar_id") var caldavCalendarId: Int = 0,
    @ColumnInfo(name = "caldav_display_name") var caldavDisplayName: String = "",
-        @ColumnInfo(name = "caldav_email") var caldavEmail: String = "") {
+    @ColumnInfo(name = "caldav_email") var caldavEmail: String = "",
+    @ColumnInfo(name = "type") var type: Int = OTHER_EVENT
+) {
    fun getDisplayTitle() = if (caldavCalendarId == 0) title else "$caldavDisplayName ($caldavEmail)"

    fun isSyncedEventType() = caldavCalendarId != 0
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">الإثنين</string>
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Bazar ertəsi</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Заняты</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">панядзелак</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Не са намерени календари, които да могат да се синхронизират</string>
    <string name="status_free">Свободно</string>
    <string name="status_busy">Заето</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Понеделник</string>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -227,6 +227,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">সোমবার</string>
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Lun</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No s\'ha trobat cap calendari que es pugui sincronitzar</string>
    <string name="status_free">Lliure</string>
    <string name="status_busy">Ocupat</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">dilluns</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nebyly nalezeny žádné synchronizovatelné kalendáře</string>
    <string name="status_free">K dispozici</string>
    <string name="status_busy">Zaneprázdněný</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">pondělí</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Der er ikke fundet nogen kalendere der kan synkroniseres</string>
    <string name="status_free">Ledig</string>
    <string name="status_busy">Optaget</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Mandag</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Es wurden keine synchronisierbaren Kalender gefunden</string>
    <string name="status_free">Verfügbar</string>
    <string name="status_busy">Beschäftigt</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Montag</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Δεν μπόρεσαν να βρεθούν συγχρονισμένα Ημερολόγια</string>
    <string name="status_free">Ελεύθερα</string>
    <string name="status_busy">Κατειλημμένα</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Δευτέρα</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">lundo</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No se han encontrado calendarios para sincronizar</string>
    <string name="status_free">Libre</string>
    <string name="status_busy">Ocupado</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">lunes</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Monday</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Sinkronizatu daitekeen egutegirik ez da aurkitu</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">astelehenean</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Synkronoitavia kalentereita ei löytynyt</string>
    <string name="status_free">Vapaa</string>
    <string name="status_busy">Varattu</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Maanantaisin</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Aucun agenda synchronisable n\'a été trouvé</string>
    <string name="status_free">Disponible</string>
    <string name="status_busy">Occupé</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Lundi</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Non se atoparon calendarios sincronizados</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">luns</string>
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Monday</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nijedan sinkronizirajući kalendar nije pronađen</string>
    <string name="status_free">Slobodan/Slobodna</string>
    <string name="status_busy">Zauzet/Zauzeta</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Ponedjeljak</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nem találhatók szinkronizálható naptárak</string>
    <string name="status_free">Szabad</string>
    <string name="status_busy">Elfoglalt</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">hétfőn</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Senin</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Non é stato trovato nessun calendario sincronizzabile</string>
    <string name="status_free">Disponibile</string>
    <string name="status_busy">Occupato</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Lunedì</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">לא נמצאו לוחות שנה הניתנים לסנכרון</string>
    <string name="status_free">Free</string>
    <string name="status_busy">עסוק</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">שני</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -229,6 +229,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">月曜日</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">월요일</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nerasta jokių sinchronizuojamų kalendorių</string>
    <string name="status_free">Laisvas</string>
    <string name="status_busy">Užimtas</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Pirmadienį</string>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">pirmdiena</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Mandag</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -224,6 +224,7 @@
    <string name="no_synchronized_calendars">Er zijn geen gesynchroniseerde agenda\'s gevonden.</string>
    <string name="status_free">Vrij</string>
    <string name="status_busy">Bezet</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">maandag</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nie znaleziono kalendarzy, które można zsynchronizować</string>
    <string name="status_free">Wolny</string>
    <string name="status_busy">Zajęty</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">poniedziałek</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nenhum calendário encontrado para a sincronização</string>
    <string name="status_free">Livre</string>
    <string name="status_busy">Ocupado</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Segunda</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Não existem calendários passíveis de sincronização</string>
    <string name="status_free">Livre</string>
    <string name="status_busy">Ocupado</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">segunda</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nu au fost găsite calendare care pot fi sincronizate</string>
    <string name="status_free">Liber</string>
    <string name="status_busy">Ocupat</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Luni</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Синхронизируемые календари не найдены</string>
    <string name="status_free">Свободен</string>
    <string name="status_busy">Занят</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">понедельник</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Nenašli sa žiadne synchronizovateľné kalendáre</string>
    <string name="status_free">Dostupný</string>
    <string name="status_busy">Zaneprázdnený</string>
+    <string name="fetching_event_failed">Pridávanie udalosti %s zlyhalo</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">pondelok</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Inga synkroniserbara kalendrar har hittats</string>
    <string name="status_free">Ledig</string>
    <string name="status_busy">Upptagen</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Måndag</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Monday</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Eşzamanlanabilir takvim bulunamadı</string>
    <string name="status_free">Serbest</string>
    <string name="status_busy">Meşgul</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">Pazartesi</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">Не знайдено календарів для синхронізації</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Зайнятий</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">понеділок</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">未发现可同步的日历</string>
    <string name="status_free">空闲</string>
    <string name="status_busy">繁忙</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">星期一</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">空閒</string>
    <string name="status_busy">繁忙</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">星期一</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -228,6 +228,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">空閒</string>
    <string name="status_busy">繁忙</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>
    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->
    <string name="monday_alt">星期一</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -239,6 +239,7 @@
    <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
    <string name="status_free">Free</string>
    <string name="status_busy">Busy</string>
+    <string name="fetching_event_failed">Fetching event %s failed</string>

    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
    <!-- used in repetition, like "Every last Sunday" -->