Add Activity to display a list of events

[unical.git] / src / ro / ieval / unical / Event.java

diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java
index d1e8b22d803a6925aa4d0821ed6c3d86a3c52e40..cdeafaf5befb0300d5751c790080404492477380 100644 (file)
--- a/src/ro/ieval/unical/Event.java
+++ b/src/ro/ieval/unical/Event.java
@@ -1,11 +1,15 @@
 package ro.ieval.unical;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+
 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{
@@ -22,7 +26,7 @@ final class Event implements Parcelable{
        };
 
        private static final String[] PROJECTION = {
-               Events._ID,
+               BaseColumns._ID,
                Events.ORGANIZER,
                Events.TITLE,
                Events.EVENT_LOCATION,
@@ -73,10 +77,21 @@ final class Event implements Parcelable{
                                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();
+               }
+               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))
+                               r.add(event);
+               return  r.toArray(new Event[r.size()]);
+       }
 
        public void delete(final Context context){
                final ContentResolver cr=context.getContentResolver();