Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit fe1309ef authored by Dominik Schürmann's avatar Dominik Schürmann Committed by GitHub
Browse files

Allow name and displayName to be null (#643)

parent 13bbfa52

src/com/android/calendar/persistence/Calendar.kt

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ package com.android.calendar.persistence 
data class Calendar(val id: Long,

                    val accountName: String,

                    val accountType: String,

                    val name: String,

                    val displayName: String,

                    val name: String?,

                    val displayName: String?,

                    val color: Int,

                    val visible: Boolean,

                    val syncEvents: Boolean,

src/com/android/calendar/persistence/CalendarRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ internal class CalendarRepository(val application: Application) { 
                    val accountName = it.getString(PROJECTION_INDEX_ACCOUNT_NAME)

                    val accountType = it.getString(PROJECTION_INDEX_ACCOUNT_TYPE)

                    val name = it.getString(PROJECTION_INDEX_NAME)

                    val calName = it.getString(PROJECTION_INDEX_CALENDAR_DISPLAY_NAME)

                    val displayName = it.getString(PROJECTION_INDEX_CALENDAR_DISPLAY_NAME)

                    val color = it.getInt(PROJECTION_INDEX_CALENDAR_COLOR)

                    val visible = it.getInt(PROJECTION_INDEX_VISIBLE) == 1

                    val syncEvents = it.getInt(PROJECTION_INDEX_SYNC_EVENTS) == 1

                    val isPrimary = it.getInt(PROJECTION_INDEX_IS_PRIMARY) == 1

                    val isLocal = accountType == CalendarContract.ACCOUNT_TYPE_LOCAL



                    calendars.add(Calendar(id, accountName, accountType, name, calName, color, visible, syncEvents, isPrimary, isLocal))

                    calendars.add(Calendar(id, accountName, accountType, name, displayName, color, visible, syncEvents, isPrimary, isLocal))

                }

            }

            return calendars