From 458de457ea0d2f5812db947c71a6d1d66b629e42 Mon Sep 17 00:00:00 2001 From: Sunik Kupfer Date: Tue, 13 May 2025 09:12:02 +0200 Subject: [PATCH 1/3] Check cursor has next value --- lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt index 4fa98750..71b3edae 100644 --- a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt +++ b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt @@ -703,9 +703,9 @@ abstract class AndroidEvent( var rebuild = false if (event.status == null) calendar.provider.query(eventSyncURI(), arrayOf(Events.STATUS), null, null, null)?.use { cursor -> - cursor.moveToNext() - if (!cursor.isNull(0)) // Events.STATUS != null - rebuild = true + if (cursor.moveToNext()) + if (!cursor.isNull(0)) // Events.STATUS != null + rebuild = true } if (rebuild) { // delete whole event and insert updated event From d921cf2831b652e22ae67c9879c4a1f50f7eea09 Mon Sep 17 00:00:00 2001 From: Sunik Kupfer Date: Tue, 13 May 2025 09:14:25 +0200 Subject: [PATCH 2/3] Use getColumnIndexOrThrow for clarity --- lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt index 71b3edae..441267b7 100644 --- a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt +++ b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt @@ -703,9 +703,11 @@ abstract class AndroidEvent( var rebuild = false if (event.status == null) calendar.provider.query(eventSyncURI(), arrayOf(Events.STATUS), null, null, null)?.use { cursor -> - if (cursor.moveToNext()) - if (!cursor.isNull(0)) // Events.STATUS != null + if (cursor.moveToNext()) { + val statusIndex = cursor.getColumnIndexOrThrow(Events.STATUS) + if (!cursor.isNull(statusIndex)) rebuild = true + } } if (rebuild) { // delete whole event and insert updated event From 778e41493a9309440b0aa502ac9992bb2904c97e Mon Sep 17 00:00:00 2001 From: Sunik Kupfer Date: Tue, 13 May 2025 09:15:43 +0200 Subject: [PATCH 3/3] Fix linting --- lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt index 441267b7..d8b00029 100644 --- a/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt +++ b/lib/src/main/kotlin/at/bitfire/ical4android/AndroidEvent.kt @@ -365,7 +365,7 @@ abstract class AndroidEvent( // scheduling if (groupScheduled) { // ORGANIZER must only be set for group-scheduled events (= events with attendees) - if (row.containsKey(Events.ORGANIZER) && groupScheduled) + if (row.containsKey(Events.ORGANIZER)) try { event.organizer = Organizer(URI("mailto", row.getAsString(Events.ORGANIZER), null)) } catch (e: URISyntaxException) { @@ -489,7 +489,7 @@ abstract class AndroidEvent( EXTNAME_URL -> try { event.url = URI(rawValue) - } catch(e: URISyntaxException) { + } catch(_: URISyntaxException) { logger.warning("Won't process invalid local URL: $rawValue") }