From a914b2e59346ecc044a7265447ea028b8d122973 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 23 Aug 2017 22:38:01 +0200
Subject: [PATCH] catch Exceptions thrown at updating calendars

---
 .../calendar/dialogs/UpdateEventTypeDialog.kt               | 2 +-
 .../com/simplemobiletools/calendar/helpers/CalDAVHandler.kt | 6 +++++-
 app/src/main/res/values-de/strings.xml                      | 1 +
 app/src/main/res/values-es/strings.xml                      | 1 +
 app/src/main/res/values-fr/strings.xml                      | 1 +
 app/src/main/res/values-hi-rIN/strings.xml                  | 1 +
 app/src/main/res/values-hu/strings.xml                      | 1 +
 app/src/main/res/values-it/strings.xml                      | 1 +
 app/src/main/res/values-iw/strings.xml                      | 1 +
 app/src/main/res/values-ja/strings.xml                      | 1 +
 app/src/main/res/values-ko/strings.xml                      | 1 +
 app/src/main/res/values-pl/strings.xml                      | 1 +
 app/src/main/res/values-pt-rBR/strings.xml                  | 1 +
 app/src/main/res/values-pt/strings.xml                      | 1 +
 app/src/main/res/values-ru/strings.xml                      | 1 +
 app/src/main/res/values-sk/strings.xml                      | 1 +
 app/src/main/res/values-sv/strings.xml                      | 1 +
 app/src/main/res/values-tr/strings.xml                      | 1 +
 app/src/main/res/values/strings.xml                         | 1 +
 19 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt
index 010d58ece..055e54d47 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt
@@ -75,7 +75,7 @@ class UpdateEventTypeDialog(val activity: Activity, var eventType: EventType? =
                     dismiss()
                     callback.invoke(eventTypeId)
                 } else {
-                    activity.toast(R.string.unknown_error_occurred)
+                    activity.toast(R.string.editing_calendar_failed)
                 }
             })
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt
index 220a4530a..79741a5e4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt
@@ -83,7 +83,11 @@ class CalDAVHandler(val context: Context) {
         val uri = CalendarContract.Calendars.CONTENT_URI
         val values = fillCalendarContentValues(eventType)
         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 {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 340335003..3d95b1cd8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 197fe464d..8ebdb7d8d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ad19eec0b..ddad35671 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 8abc52b7f..134e0abd8 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 15024f373..da4f4da1a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 82719ad16..335851fb6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 354e9866d..d2d5427e4 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index efada712f..dbfc2e139 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 4bc234213..f4cb7a8a0 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">CalDAV 캘린더들 새로고침</string>
     <string name="refreshing">새로고침 중…</string>
     <string name="refreshing_complete">새로고침 완료</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d 분</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 835000a43..352199b63 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -204,6 +204,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minutę</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e9666ce7b..ba0166ea9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f8a7e4391..e0e00691c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minuto</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4416301c3..54c74d71a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -213,6 +213,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d минута</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 626c9ea21..3cc05e55b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -206,6 +206,7 @@
     <string name="refresh_caldav_calendars">Obnoviť CalDAV kalendáre</string>
     <string name="refreshing">Obnovuje sa…</string>
     <string name="refreshing_complete">Obnovovanie ukončené</string>
+    <string name="editing_calendar_failed">Úprava kalendára zlyhala</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minútu</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index bc6872992..b168ee9cd 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minut</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f9912840e..c8c5ad14e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71750727f..78668e2ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -199,6 +199,7 @@
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
+    <string name="editing_calendar_failed">Editing calendar failed</string>
 
     <plurals name="by_minutes">
         <item quantity="one">%1$d minute</item>