Merge pull request #3 from JenteJan/fix/strip-rrule-write

Strip leading RRULE: prefix when writing recurrence  rule (fixes Invalid recurrence rule)

Author: ahmtydn

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.5
+
+### Bug Fixes
+- Fixed recurring-event creation validation for RRULE strings (e.g. `RRULE:FREQ=DAILY;COUNT=10`) that previously caused "Invalid recurrence rule" errors when calling `createEvent`. Thanks to @jaydaptif-solutions for reporting and testing the fix.
+
 ## 1.0.4
 ### Bug Fixes
 - Fixed timezone handling issue by updating the `timezone` dependency to version `0.10.1`, ensuring better compatibility and functionality across different platforms.

android/src/main/kotlin/com/ahmtydn/calendar_bridge/EventManager.kt

@@ -7,7 +7,6 @@ import android.database.Cursor
 import android.provider.CalendarContract
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.text.SimpleDateFormat
 import java.util.*
 
 class EventManager(private val context: Context) {
@@ -38,12 +37,10 @@ class EventManager(private val context: Context) {
         var selectionArgs: Array<String>
 
         if (eventIds != null && eventIds.isNotEmpty()) {
-            // Query specific events by ID
             val placeholders = eventIds.joinToString(",") { "?" }
             selection = "${CalendarContract.Instances.EVENT_ID} IN ($placeholders)"
             selectionArgs = eventIds.toTypedArray()
         } else {
-            // Query by calendar and date range using Instances
             val selectionParts = mutableListOf("${CalendarContract.Events.CALENDAR_ID} = ?")
             val argsList = mutableListOf(calendarId)
 
@@ -61,7 +58,6 @@ class EventManager(private val context: Context) {
             selectionArgs = argsList.toTypedArray()
         }
 
-
         val instancesUri = CalendarContract.Instances.CONTENT_URI.buildUpon().apply {
             ContentUris.appendId(this, startDate ?: 0L)
             ContentUris.appendId(this, endDate ?: Long.MAX_VALUE)
@@ -103,19 +99,19 @@ class EventManager(private val context: Context) {
 
                 description?.let { eventMap["description"] = it }
                 location?.let { eventMap["location"] = it }
-                rrule?.let { eventMap["recurrenceRule"] = it }
+                rrule?.let { 
+                    eventMap["recurrenceRule"] = "RRULE:$it"
+                }
 
                 if (rrule != null) {
                     eventMap["originalStart"] = originalStartTime
                 }
 
-                // Get attendees
                 val attendees = getEventAttendees(eventId)
                 if (attendees.isNotEmpty()) {
                     eventMap["attendees"] = attendees
                 }
 
-                // Get reminders
                 val reminders = getEventReminders(eventId)
                 if (reminders.isNotEmpty()) {
                     eventMap["reminders"] = reminders
@@ -169,8 +165,14 @@ class EventManager(private val context: Context) {
                 put(CalendarContract.Events.STATUS, statusFromString(it as String))
             }
 
-            arguments["recurrenceRule"]?.let { 
-                put(CalendarContract.Events.RRULE, it as String)
+            arguments["recurrenceRule"]?.let {
+                val raw = it as String
+                val normalized = if (raw.startsWith("RRULE:", ignoreCase = true)) {
+                    raw.substring(6).trim()
+                } else {
+                    raw.trim()
+                }
+                put(CalendarContract.Events.RRULE, normalized)
             }
         }
 
@@ -180,12 +182,10 @@ class EventManager(private val context: Context) {
         val eventId = uri.lastPathSegment
             ?: throw CalendarException.PlatformError("Failed to get event ID")
 
-        // Add attendees if provided
         arguments["attendees"]?.let { attendees ->
             addEventAttendees(eventId, attendees as List<Map<String, Any>>)
         }
 
-        // Add reminders if provided
         arguments["reminders"]?.let { reminders ->
             addEventReminders(eventId, reminders as List<Map<String, Any>>)
         }
@@ -197,7 +197,6 @@ class EventManager(private val context: Context) {
         val eventId = arguments["eventId"] as? String
             ?: throw CalendarException.InvalidArgument("Event ID is required")
 
-        // Check if event exists
         val cursor = context.contentResolver.query(
             CalendarContract.Events.CONTENT_URI,
             arrayOf(CalendarContract.Events._ID),
@@ -246,8 +245,14 @@ class EventManager(private val context: Context) {
             values.put(CalendarContract.Events.STATUS, statusFromString(it as String))
         }
 
-        arguments["recurrenceRule"]?.let { 
-            values.put(CalendarContract.Events.RRULE, it as String)
+        arguments["recurrenceRule"]?.let {
+            val raw = it as String
+            val normalized = if (raw.startsWith("RRULE:", ignoreCase = true)) {
+                raw.substring(6).trim()
+            } else {
+                raw.trim()
+            }
+            values.put(CalendarContract.Events.RRULE, normalized)
         }
 
         val updatedRows = context.contentResolver.update(
@@ -261,35 +266,28 @@ class EventManager(private val context: Context) {
             throw CalendarException.PlatformError("Failed to update event")
         }
 
-        // Update attendees if provided
         arguments["attendees"]?.let { attendees ->
-            // Delete existing attendees
             context.contentResolver.delete(
                 CalendarContract.Attendees.CONTENT_URI,
                 "${CalendarContract.Attendees.EVENT_ID} = ?",
                 arrayOf(eventId)
             )
-            // Add new attendees
             addEventAttendees(eventId, attendees as List<Map<String, Any>>)
         }
 
-        // Update reminders if provided
         arguments["reminders"]?.let { reminders ->
-            // Delete existing reminders
             context.contentResolver.delete(
                 CalendarContract.Reminders.CONTENT_URI,
                 "${CalendarContract.Reminders.EVENT_ID} = ?",
                 arrayOf(eventId)
             )
-            // Add new reminders
             addEventReminders(eventId, reminders as List<Map<String, Any>>)
         }
 
         return@withContext eventId
     }
 
     suspend fun deleteEvent(calendarId: String, eventId: String): Boolean = withContext(Dispatchers.IO) {
-        // Verify event exists in the specified calendar
         val cursor = context.contentResolver.query(
             CalendarContract.Events.CONTENT_URI,
             arrayOf(CalendarContract.Events._ID, CalendarContract.Events.CALENDAR_ID),
@@ -314,7 +312,6 @@ class EventManager(private val context: Context) {
     }
 
     suspend fun deleteEventInstance(calendarId: String, eventId: String, startDate: Long, followingInstances: Boolean): Boolean = withContext(Dispatchers.IO) {
-        // Verify event exists in the specified calendar
         val cursor = context.contentResolver.query(
             CalendarContract.Events.CONTENT_URI,
             arrayOf(CalendarContract.Events._ID, CalendarContract.Events.CALENDAR_ID, CalendarContract.Events.RRULE),
@@ -332,7 +329,6 @@ class EventManager(private val context: Context) {
             isRecurring = !rrule.isNullOrEmpty()
         } ?: throw CalendarException.EventNotFound(eventId)
 
-        // For recurring events, create an exception instead of deleting
         if (isRecurring) {
             val exceptionValues = ContentValues().apply {
                 put(CalendarContract.Events.ORIGINAL_ID, eventId)
@@ -341,16 +337,13 @@ class EventManager(private val context: Context) {
                 put(CalendarContract.Events.STATUS, CalendarContract.Events.STATUS_CANCELED)
 
                 if (followingInstances) {
-                    // For future events, we need to modify the original event's RRULE
-                    // This is a simplified implementation - in practice, you'd need to update the RRULE
                     put(CalendarContract.Events.DTSTART, startDate)
                 }
             }
 
             val uri = context.contentResolver.insert(CalendarContract.Events.CONTENT_URI, exceptionValues)
             return@withContext uri != null
         } else {
-            // For non-recurring events, just delete normally
             return@withContext deleteEvent(calendarId, eventId)
         }
     }