X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEvent.java;h=41809e9c6b2ca8dc2d5afc4d2fdd04edc6e43875;hb=412b2d69431430c4ae231ae599b5065603d8cffa;hp=f8e35cc78203125d6fd32f0e531b677735d6ca8c;hpb=c1da3e5da33d975f4665952ee8ed41a3a5b11270;p=unical.git

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index f8e35cc..41809e9 100644
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -8,6 +8,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.provider.BaseColumns;
 import android.provider.CalendarContract.Events;
 
 final class Event implements Parcelable{
@@ -24,7 +25,7 @@ final class Event implements Parcelable{
 	};
 
 	private static final String[] PROJECTION = {
-		Events._ID,
+		BaseColumns._ID,
 		Events.ORGANIZER,
 		Events.TITLE,
 		Events.EVENT_LOCATION,
@@ -47,14 +48,14 @@ final class Event implements Parcelable{
 	public final String description;
 	/** Event colour */
 	public final int eventColour;
-	/** Event start time (UTC milliseconds since epoch) */ 
+	/** Event start time (UTC milliseconds since epoch) */
 	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, final long calendarID) {
+	public 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;
@@ -66,26 +67,29 @@ final class Event implements Parcelable{
 		this.calendarID=calendarID;
 	}
 
-	public static Event[] getEventsByCalendar(final Context context, final long calendarID, final String sort){
+	public static Event[] getEventsByCalendar(final Context context, final Calendar calendar, final String sort){
 		final ContentResolver cr=context.getContentResolver();
 		final Cursor cursor = cr.query(Events.CONTENT_URI,
 				PROJECTION,
 				Events.CALENDAR_ID+" = ?",
-				new String[]{Long.toString(calendarID)},
+				new String[]{Long.toString(calendar._id)},
 				sort);
 		cursor.moveToFirst();
 		final Event[] events = new Event[cursor.getCount()];
 		for(int i=0;i<events.length;i++){
-			events[i]=new Event(cursor.getLong(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));
+			int colour=cursor.getInt(5);
+			colour=colour == 0 ? calendar.colour : colour;
+			events[i]=new Event(cursor.getLong(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), colour, cursor.getLong(6), cursor.getLong(7), cursor.getLong(8));
 			cursor.moveToNext();
 		}
+		cursor.close();
 		return events;
 	}
-	
+
 	public static Event[] getAllEvents(final Context context) {
 		final ArrayList<Event> r = new ArrayList<Event>();
 		for(final Calendar calendar : Calendar.getAllCalendars(context))
-			for(final Event event : getEventsByCalendar(context, calendar._id, null))
+			for(final Event event : getEventsByCalendar(context, calendar, null))
 				r.add(event);
 		return  r.toArray(new Event[r.size()]);
 	}