X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEvent.java;h=af41133cda1098a1a0c4f1a97214c0f2160401f3;hb=16e2550caf5627ad8fdacaef50f1ff0c3d68d474;hp=095d07a56ac7481600ba33b3b0df78fbce80fc89;hpb=4b8bd2f81a7457106a029fc06c3efd5a70a65703;p=unical.git

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index 095d07a..af41133 100644
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -11,12 +11,12 @@ 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) {
-			return new Event(source.readLong(), source.readString(), source.readString(), source.readString(), source.readString(), source.readInt(), source.readLong(), source.readLong());
+		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];
 		}
 	};
@@ -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,19 +61,22 @@ 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){
+	public static Event[] getEventsByCalendar(final Context context, final long calendarID, 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(calendarID)},
+				sort);
 		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));
+		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));
+			cursor.moveToNext();
+		}
 		return events;
 	}
 
@@ -86,7 +91,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);
@@ -95,5 +100,6 @@ final class Event implements Parcelable{
 		dest.writeInt(eventColour);
 		dest.writeLong(dtstart);
 		dest.writeLong(dtend);
+		dest.writeLong(calendarID);
 	}
 }