use proper event type id at caldav events

app/proguard-rules.pro

@@ -1,9 +1,6 @@
 # Joda
 -dontwarn org.joda.time.**
 
--keep class com.google.common.**
--dontwarn com.google.common.**
-
 -renamesourcefileattribute SourceFile
 -keepattributes SourceFile, LineNumberTable, Signature, RuntimeVisibleAnnotations,AnnotationDefault
 

app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt

@@ -33,8 +33,7 @@ class CalDAVHandler(val context: Context) {
                 dbHelper.updateLocalEventType(this)
             }
 
-            val eventTypeId = dbHelper.getEventTypeIdWithTitle(it.getFullTitle())
-            CalDAVHandler(context).fetchCalDAVCalendarEvents(it.id, eventTypeId)
+            CalDAVHandler(context).fetchCalDAVCalendarEvents(it.id, localEventType!!.id)
         }
         context.scheduleCalDAVSync(true)
         callback()

app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt

@@ -758,7 +758,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
 
     private fun fillEvents(cursor: Cursor?): List<Event> {
         val eventTypeColors = SparseIntArray()
-        val eventTypes = fetchEventTypes().forEach {
+        fetchEventTypes().forEach {
             eventTypeColors.put(it.id, it.color)
         }