show the currently selected calendar info on the events screen

app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt

@@ -14,6 +14,7 @@ import com.simplemobiletools.calendar.dialogs.*
 import com.simplemobiletools.calendar.extensions.*
 import com.simplemobiletools.calendar.helpers.*
 import com.simplemobiletools.calendar.helpers.Formatter
+import com.simplemobiletools.calendar.models.CalDAVCalendar
 import com.simplemobiletools.calendar.models.Event
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
@@ -388,15 +389,27 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
             event_caldav_calendar_image.beVisible()
             event_caldav_calendar_holder.beVisible()
             event_caldav_calendar_divider.beVisible()
+
+            val calendars = CalDAVEventsHandler(applicationContext).getCalDAVCalendars().filter { it.canWrite() }
+            updateCurrentCalendarInfo(getCalendarWithId(calendars))
+
             event_caldav_calendar_holder.setOnClickListener {
-                val calendars = CalDAVEventsHandler(applicationContext).getCalDAVCalendars().filter { it.canWrite() }
                 SelectEventCalendarDialog(this, calendars, config.lastUsedCaldavCalendar) {
                     config.lastUsedCaldavCalendar = it
+                    updateCurrentCalendarInfo(getCalendarWithId(calendars))
                 }
             }
         }
     }
 
+    private fun getCalendarWithId(calendars: List<CalDAVCalendar>): CalDAVCalendar? =
+            calendars.firstOrNull { it.id == config.lastUsedCaldavCalendar }
+
+    private fun updateCurrentCalendarInfo(currentCalendar: CalDAVCalendar?) {
+        event_caldav_calendar_name.text = currentCalendar?.displayName
+        event_caldav_calendar_email.text = currentCalendar?.accountName
+    }
+
     private fun toggleAllDay(isChecked: Boolean) {
         hideKeyboard()
         event_start_time.beGoneIf(isChecked)

app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt

@@ -40,7 +40,7 @@ class SelectCalendarsDialog(val activity: Activity, val callback: () -> Unit) :
         }
     }
 
-    private fun addCalendarItem(isEvent: Boolean, text: String, tag: Long = 0L, shouldCheck: Boolean = false) {
+    private fun addCalendarItem(isEvent: Boolean, text: String, tag: Int = 0, shouldCheck: Boolean = false) {
         val calendarItem = activity.layoutInflater.inflate(if (isEvent) R.layout.calendar_item_calendar else R.layout.calendar_item_account,
                 view.dialog_select_calendars_holder, false)
 

app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt

@@ -63,4 +63,4 @@ class SelectEventCalendarDialog(val activity: Activity, val calendars: List<CalD
         callback.invoke(typeId)
         dialog?.dismiss()
     }
-}
+}

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

@@ -37,7 +37,7 @@ class CalDAVEventsHandler(val context: Context) {
             cursor = context.contentResolver.query(uri, projection, selection, null, null)
             if (cursor != null && cursor.moveToFirst()) {
                 do {
-                    val id = cursor.getLongValue(CalendarContract.Calendars._ID)
+                    val id = cursor.getIntValue(CalendarContract.Calendars._ID)
                     val displayName = cursor.getStringValue(CalendarContract.Calendars.CALENDAR_DISPLAY_NAME)
                     val accountName = cursor.getStringValue(CalendarContract.Calendars.ACCOUNT_NAME)
                     val ownerName = cursor.getStringValue(CalendarContract.Calendars.OWNER_ACCOUNT)
@@ -53,7 +53,7 @@ class CalDAVEventsHandler(val context: Context) {
         return calendars
     }
 
-    fun fetchCalDAVCalendarEvents(calendarId: Long, eventTypeId: Int) {
+    fun fetchCalDAVCalendarEvents(calendarId: Int, eventTypeId: Int) {
         val importIdsMap = HashMap<String, Event>()
         val existingEvents = context.dbHelper.getEventsFromCalDAVCalendar(calendarId)
         existingEvents.forEach {
@@ -122,7 +122,7 @@ class CalDAVEventsHandler(val context: Context) {
         }
     }
 
-    fun addCalDAVEvent(event: Event, calendarId: Long) {
+    fun addCalDAVEvent(event: Event, calendarId: Int) {
         val uri = CalendarContract.Events.CONTENT_URI
         val values = ContentValues().apply {
             put(CalendarContract.Events.CALENDAR_ID, calendarId)
@@ -196,5 +196,5 @@ class CalDAVEventsHandler(val context: Context) {
         return reminders
     }
 
-    fun getCalDAVEventImportId(calendarId: Long, eventId: Long) = "$CALDAV-$calendarId-$eventId"
+    fun getCalDAVEventImportId(calendarId: Int, eventId: Long) = "$CALDAV-$calendarId-$eventId"
 }

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

@@ -675,7 +675,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
         return events
     }
 
-    fun getEventsFromCalDAVCalendar(calendarId: Long): List<Event> {
+    fun getEventsFromCalDAVCalendar(calendarId: Int): List<Event> {
         val selection = "$MAIN_TABLE_NAME.$COL_EVENT_SOURCE = ?"
         val selectionArgs = arrayOf("$CALDAV-$calendarId")
         val cursor = getEventsCursor(selection, selectionArgs)

app/src/main/kotlin/com/simplemobiletools/calendar/models/CalDAVCalendar.kt

@@ -1,5 +1,5 @@
 package com.simplemobiletools.calendar.models
 
-data class CalDAVCalendar(val id: Long, val displayName: String, val accountName: String, val ownerName: String, val color: Int, val accessLevel: Int) {
+data class CalDAVCalendar(val id: Int, val displayName: String, val accountName: String, val ownerName: String, val color: Int, val accessLevel: Int) {
     fun canWrite() = accessLevel >= 500
 }