wbrawner/Simple-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly select the synced calendar at event activity

Browse source
This commit is contained in:
tibbi 2017-08-21 14:57:43 +02:00
parent 6d74925a25
commit 41cc9009af
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,13 +391,13 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
val calendars = CalDAVEventsHandler(applicationContext).getCalDAVCalendars().filter { val calendars = CalDAVEventsHandler(applicationContext).getCalDAVCalendars().filter {
it.canWrite() && config.getSyncedCalendarIdsAsList().contains(it.id.toString()) it.canWrite() && config.getSyncedCalendarIdsAsList().contains(it.id.toString())
} }
updateCurrentCalendarInfo(getCalendarWithId(calendars)) updateCurrentCalendarInfo(getCalendarWithId(calendars, getCalendarId()))
event_caldav_calendar_holder.setOnClickListener { event_caldav_calendar_holder.setOnClickListener {
hideKeyboard() hideKeyboard()
SelectEventCalendarDialog(this, calendars, config.lastUsedCaldavCalendar) { SelectEventCalendarDialog(this, calendars, getCalendarId()) {
config.lastUsedCaldavCalendar = it config.lastUsedCaldavCalendar = it
updateCurrentCalendarInfo(getCalendarWithId(calendars)) updateCurrentCalendarInfo(getCalendarWithId(calendars, it))
} }
} }
} else { } else {
@ -405,8 +405,10 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
} }
} }
private fun getCalendarWithId(calendars: List<CalDAVCalendar>): CalDAVCalendar? = private fun getCalendarId() = if (mEvent.source == SOURCE_SIMPLE_CALENDAR) config.lastUsedCaldavCalendar else mEvent.getCalDAVCalendarId()
calendars.firstOrNull { it.id == config.lastUsedCaldavCalendar }
private fun getCalendarWithId(calendars: List<CalDAVCalendar>, calendarId: Int): CalDAVCalendar? =
calendars.firstOrNull { it.id == calendarId }
private fun updateCurrentCalendarInfo(currentCalendar: CalDAVCalendar?) { private fun updateCurrentCalendarInfo(currentCalendar: CalDAVCalendar?) {
event_type_image.beVisibleIf(currentCalendar == null) event_type_image.beVisibleIf(currentCalendar == null)