X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEvent.java;h=c1648056963e54568c7987551da2a9d5632fb0e7;hb=070d3ab2d6f382ab74988df71eba137424df525f;hp=85ad215edd6e8d75c464873932623e55c488a914;hpb=d003a6ce087a52c95f514d4e5ecad0312125f965;p=unical.git

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index 85ad215..c164805 100644
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -1,28 +1,31 @@
 package ro.ieval.unical;
 
+import java.util.ArrayList;
+
 import android.content.ContentResolver;
 import android.content.Context;
 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{
 	public static final Parcelable.Creator<Event> CREATOR = new Parcelable.Creator<Event>() {
 		@Override
-		public Event createFromParcel(Parcel source) {
+		public Event createFromParcel(final Parcel source) {
 			return new Event(source.readLong(), source.readString(), source.readString(), source.readString(), source.readString(), source.readInt(), source.readLong(), source.readLong(), source.readLong());
 		}
 
 		@Override
-		public Event[] newArray(int size) {
+		public Event[] newArray(final int size) {
 			return new Event[size];
 		}
 	};
 
 	private static final String[] PROJECTION = {
-		Events._ID,
+		BaseColumns._ID,
 		Events.ORGANIZER,
 		Events.TITLE,
 		Events.EVENT_LOCATION,
@@ -45,7 +48,7 @@ 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;
@@ -64,20 +67,33 @@ final class Event implements Parcelable{
 		this.calendarID=calendarID;
 	}
 
-	public static Event[] getEventsByCalendar(final Context context, final int calendarID){
+	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[]{Integer.toString(calendarID)},
-				null);
+				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));
+		for(int i=0;i<events.length;i++){
+			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, null))
+				r.add(event);
+		return  r.toArray(new Event[r.size()]);
+	}
+
 	public void delete(final Context context){
 		final ContentResolver cr=context.getContentResolver();
 		cr.delete(Uri.withAppendedPath(Events.CONTENT_URI, Long.toString(_id)), null, null);
@@ -89,7 +105,7 @@ final class Event implements Parcelable{
 	}
 
 	@Override
-	public void writeToParcel(Parcel dest, int flags) {
+	public void writeToParcel(final Parcel dest, final int flags) {
 		dest.writeLong(_id);
 		dest.writeString(organizer);
 		dest.writeString(title);