Add calendarID field to Event

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index 095d07a56ac7481600ba33b3b0df78fbce80fc89..66872af85598c60f919ce6e8c9507593a63ec464 100644 (file)
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -12,7 +12,7 @@ final class Event implements Parcelable{
        public static final Parcelable.Creator<Event> CREATOR = new Parcelable.Creator<Event>() {
                @Override
                public Event createFromParcel(Parcel source) {
-                       return new Event(source.readLong(), source.readString(), source.readString(), source.readString(), source.readString(), source.readInt(), source.readLong(), source.readLong());
+                       return new Event(source.readLong(), source.readString(), source.readString(), source.readString(), source.readString(), source.readInt(), source.readLong(), source.readLong(), source.readLong());
                }
 
                @Override
@@ -30,7 +30,7 @@ final class Event implements Parcelable{
                Events.EVENT_COLOR,
                Events.DTSTART,
                Events.DTEND,
-               
+               Events.CALENDAR_ID,
        };
 
        /** Event ID */
@@ -49,8 +49,10 @@ final class Event implements Parcelable{
        public final long dtstart;
        /** Event end time (UTC milliseconds since epoch) */
        public final long dtend;
+       /** Calendar ID */
+       public final long calendarID;
 
-       private Event(final long _id, final String organizer, final String title, final String eventLocation, final String description, final int eventColor, final long dtstart, final long dtend) {
+       private Event(final long _id, final String organizer, final String title, final String eventLocation, final String description, final int eventColor, final long dtstart, final long dtend, final long calendarID) {
                this._id=_id;
                this.organizer=organizer;
                this.title=title;
@@ -59,6 +61,7 @@ final class Event implements Parcelable{
                this.eventColour=eventColor;
                this.dtstart=dtstart;
                this.dtend=dtend;
+               this.calendarID=calendarID;
        }
 
        public static Event[] getEventsByCalendar(final Context context, final int calendarID){
@@ -71,7 +74,7 @@ final class Event implements Parcelable{
                cursor.moveToFirst();
                final Event[] events = new Event[cursor.getCount()];
                for(int i=0;i<events.length;i++)
-                       events[i]=new Event(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getInt(5), cursor.getLong(6), cursor.getLong(7));
+                       events[i]=new Event(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getInt(5), cursor.getLong(6), cursor.getLong(7), cursor.getLong(8));
                return events;
        }
 
@@ -95,5 +98,6 @@ final class Event implements Parcelable{
                dest.writeInt(eventColour);
                dest.writeLong(dtstart);
                dest.writeLong(dtend);
+               dest.writeLong(calendarID);
        }
 }