Merge pull request #337 from echonox/master

Retrieve more info for Recurring Events

Author: EddyVerbruggen

src/android/nl/xservices/plugins/Calendar.java

@@ -585,7 +585,7 @@ public void run() {
           calendar_end.setTime(date_end);
 
           //projection of DB columns
-          String[] l_projection = new String[]{"calendar_id", "title", "begin", "end", "eventLocation", "allDay", "_id"};
+          String[] l_projection = new String[]{"calendar_id", "title", "begin", "end", "eventLocation", "allDay", "_id", "rrule", "rdate", "exdate", "event_id"};
 
           //actual query
           Cursor cursor = contentResolver.query(
@@ -610,7 +610,11 @@ public void run() {
                     i++,
                     new JSONObject()
                         .put("calendar_id", cursor.getString(cursor.getColumnIndex("calendar_id")))
-                        .put("event_id", cursor.getString(cursor.getColumnIndex("_id")))
+                        .put("id", cursor.getString(cursor.getColumnIndex("_id")))
+                        .put("event_id", cursor.getString(cursor.getColumnIndex("event_id")))
+                        .put("rrule", cursor.getString(cursor.getColumnIndex("rrule")))
+                        .put("rdate", cursor.getString(cursor.getColumnIndex("rdate")))
+                        .put("exdate", cursor.getString(cursor.getColumnIndex("exdate")))
                         .put("title", cursor.getString(cursor.getColumnIndex("title")))
                         .put("dtstart", cursor.getLong(cursor.getColumnIndex("begin")))
                         .put("dtend", cursor.getLong(cursor.getColumnIndex("end")))

src/ios/Calendar.m

@@ -28,7 +28,7 @@ - (void) initEventStoreWithCalendarCapabilities {
   } else { // we're on iOS 5 or older
     accessGranted = YES;
   }
-    
+
   if (accessGranted) {
     self.eventStore = eventStoreCandidate;
   }
@@ -375,6 +375,7 @@ - (NSMutableArray*) eventsToDataArray: (NSArray*)matchingEvents {
     NSMutableDictionary *entry = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
                                   event.title, @"title",
                                   event.calendar.title, @"calendar",
+                                  event.eventIdentifier, @"id",
                                   [df stringFromDate:event.startDate], @"startDate",
                                   [df stringFromDate:event.endDate], @"endDate",
                                   [df stringFromDate:event.lastModifiedDate], @"lastModifiedDate",
@@ -406,6 +407,10 @@ - (NSMutableArray*) eventsToDataArray: (NSArray*)matchingEvents {
       [entry setObject:attendees forKey:@"attendees"];
     }
 
+    if (event.recurrenceRules != nil) {
+      [entry setObject:event.recurrenceRules forKey:@"rrule"];
+    }
+
     [entry setObject:event.calendarItemIdentifier forKey:@"id"];
     [results addObject:entry];
   }