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

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index 2842638..f8e35cc 100644
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -1,5 +1,7 @@
 package ro.ieval.unical;
 
+import java.util.ArrayList;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
@@ -11,12 +13,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) {
+		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];
 		}
 	};
@@ -64,19 +66,29 @@ final class Event implements Parcelable{
 		this.calendarID=calendarID;
 	}
 
-	public static Event[] getEventsByCalendar(final Context context, final int calendarID, final String sort){
+	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)},
+				new String[]{Long.toString(calendarID)},
 				sort);
 		cursor.moveToFirst();
 		final Event[] events = new Event[cursor.getCount()];
-		for(int i=0;i<events.length;i++)
+		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;
 	}
+	
+	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))
+				r.add(event);
+		return  r.toArray(new Event[r.size()]);
+	}
 
 	public void delete(final Context context){
 		final ContentResolver cr=context.getContentResolver();
@@ -89,7 +101,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);