catch Exceptions thrown at updating calendars

This commit is contained in:
tibbi
2017-08-23 22:38:01 +02:00
parent c1a59f36a7
commit a914b2e593
19 changed files with 23 additions and 2 deletions

View File

@@ -75,7 +75,7 @@ class UpdateEventTypeDialog(val activity: Activity, var eventType: EventType? =
dismiss() dismiss()
callback.invoke(eventTypeId) callback.invoke(eventTypeId)
} else { } else {
activity.toast(R.string.unknown_error_occurred) activity.toast(R.string.editing_calendar_failed)
} }
}) })
} }

View File

@@ -83,7 +83,11 @@ class CalDAVHandler(val context: Context) {
val uri = CalendarContract.Calendars.CONTENT_URI val uri = CalendarContract.Calendars.CONTENT_URI
val values = fillCalendarContentValues(eventType) val values = fillCalendarContentValues(eventType)
val newUri = ContentUris.withAppendedId(uri, eventType.caldavCalendarId.toLong()) val newUri = ContentUris.withAppendedId(uri, eventType.caldavCalendarId.toLong())
return context.contentResolver.update(newUri, values, null, null) == 1 return try {
context.contentResolver.update(newUri, values, null, null) == 1
} catch (e: IllegalArgumentException) {
false
}
} }
private fun fillCalendarContentValues(eventType: EventType): ContentValues { private fun fillCalendarContentValues(eventType: EventType): ContentValues {

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">CalDAV 캘린더들 새로고침</string> <string name="refresh_caldav_calendars">CalDAV 캘린더들 새로고침</string>
<string name="refreshing">새로고침 중…</string> <string name="refreshing">새로고침 중…</string>
<string name="refreshing_complete">새로고침 완료</string> <string name="refreshing_complete">새로고침 완료</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d 분</item> <item quantity="one">%1$d 분</item>

View File

@@ -204,6 +204,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minutę</item> <item quantity="one">%1$d minutę</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minuto</item> <item quantity="one">%1$d minuto</item>

View File

@@ -213,6 +213,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d минута</item> <item quantity="one">%1$d минута</item>

View File

@@ -206,6 +206,7 @@
<string name="refresh_caldav_calendars">Obnoviť CalDAV kalendáre</string> <string name="refresh_caldav_calendars">Obnoviť CalDAV kalendáre</string>
<string name="refreshing">Obnovuje sa…</string> <string name="refreshing">Obnovuje sa…</string>
<string name="refreshing_complete">Obnovovanie ukončené</string> <string name="refreshing_complete">Obnovovanie ukončené</string>
<string name="editing_calendar_failed">Úprava kalendára zlyhala</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minútu</item> <item quantity="one">%1$d minútu</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minut</item> <item quantity="one">%1$d minut</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>

View File

@@ -199,6 +199,7 @@
<string name="refresh_caldav_calendars">Refresh CalDAV calendars</string> <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
<string name="refreshing">Refreshing…</string> <string name="refreshing">Refreshing…</string>
<string name="refreshing_complete">Refreshing complete</string> <string name="refreshing_complete">Refreshing complete</string>
<string name="editing_calendar_failed">Editing calendar failed</string>
<plurals name="by_minutes"> <plurals name="by_minutes">
<item quantity="one">%1$d minute</item> <item quantity="one">%1$d minute</item>