fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-17 04:10:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

use proper event type id at caldav events

Browse Source
This commit is contained in:
tibbi 2017-08-27 23:52:31 +02:00
parent 49ec9a59f5
commit 04b0bbbc96
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/proguard-rules.pro vendored
View File

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

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

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

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

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