Remove trailing whitespace

[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 8482e31d128e7f6b87635dc831b9778a4518ef20..c1648056963e54568c7987551da2a9d5632fb0e7 100644 (file)
--- 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,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;
@@ -66,30 +67,30 @@ 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) {
-               Calendar[] calendars = Calendar.getAllCalendars(context);
-               ArrayList<Event> r = new ArrayList<Event>();
-               for(int i=0; i<calendars.length; ++i) {
-                       Event[] e=getEventsByCalendar(context, calendars[i]._id, "");
-                       for(int j=0; j<e.length; ++j)
-                               r.add(e[j]);
-               }
+               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()]);
        }