Fix potential NPE

Fix #115
MM2-0 · Jul 12, 2022 · 144db40 · 144db40
1 parent 82edd0a
commit 144db40
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt b/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt
@@ -110,8 +110,11 @@ internal class CalendarRepositoryImpl(
                 ) ?: return@withContext mutableListOf()
                 val attendees = mutableListOf<String>()
                 while (cur.moveToNext()) {
-                    attendees.add(cur.getString(1).takeUnless { it.isNullOrBlank() }
-                        ?: cur.getString(2))
+                    attendees.add(
+                        cur.getStringOrNull(1).takeUnless { it.isNullOrBlank() }
+                            ?: cur.getStringOrNull(2)
+                            ?: continue
+                    )
                 }
                 cur.close()
                 val allday = cursor.getInt(4) > 0
@@ -123,13 +126,13 @@ internal class CalendarRepositoryImpl(
                     0
                 }
                 val event = CalendarEvent(
-                    label = cursor.getString(1) ?: "",
+                    label = cursor.getStringOrNull(1) ?: "",
                     id = cursor.getLong(0),
                     color = cursor.getInt(5),
                     startTime = begin - tzOffset,
                     endTime = cursor.getLong(3) - tzOffset - if (allday) 1 else 0,
                     allDay = allday,
-                    location = cursor.getString(6) ?: "",
+                    location = cursor.getStringOrNull(6) ?: "",
                     attendees = attendees,
                     description = cursor.getStringOrNull(8)
                         ?: "",
@@ -189,8 +192,8 @@ internal class CalendarRepositoryImpl(
                     calendars.add(
                         UserCalendar(
                             id = cursor.getLong(0),
-                            name = cursor.getString(5) ?: cursor.getString(1) ?: "",
-                            owner = cursor.getString(2),
+                            name = cursor.getStringOrNull(5) ?: cursor.getStringOrNull(1) ?: "",
+                            owner = cursor.getStringOrNull(2) ?: "",
                             color = cursor.getInt(3)
                         )
                     )

diff --git a/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt b/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt
@@ -51,12 +51,12 @@ class CalendarEventDeserializer(val context: Context): SearchableDeserializer {
         val cursor = context.contentResolver.query(uri, projection, selection, selArgs, null)
             ?: return null
         if (cursor.moveToNext()) {
-            val title = cursor.getString(1)
+            val title = cursor.getStringOrNull(1) ?: ""
             val begin = cursor.getLong(2)
             val end = cursor.getLong(3)
             val allday = cursor.getInt(4) != 0
             val color = cursor.getInt(5)
-            val location = cursor.getString(6)
+            val location = cursor.getStringOrNull(6)
             val calendar = cursor.getLong(7)
             val description = cursor.getStringOrNull(8)
                 ?: ""
@@ -74,8 +74,11 @@ class CalendarEventDeserializer(val context: Context): SearchableDeserializer {
             ) ?: return null
             val attendees = mutableListOf<String>()
             while (cur.moveToNext()) {
-                attendees.add(cur.getString(1).takeUnless { it.isNullOrBlank() }
-                    ?: cur.getString(2))
+                attendees.add(
+                    cur.getStringOrNull(1).takeUnless { it.isNullOrBlank() }
+                    ?: cur.getStringOrNull(2)
+                    ?: continue
+                )
             }
             cur.close()
             val tzOffset = if (allday) {