Remove trailing whitespace

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

diff --git a/src/ro/ieval/unical/Calendar.java b/src/ro/ieval/unical/Calendar.java
index 2827641c1253577c97ca32d5299898d7d67c63ac..192c93784a008812ba218eac1843c6ff6f67bd5d 100644 (file)
--- a/src/ro/ieval/unical/Calendar.java
+++ b/src/ro/ieval/unical/Calendar.java
@@ -3,20 +3,22 @@ package ro.ieval.unical;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
+import android.provider.BaseColumns;
 import android.provider.CalendarContract.Calendars;
 
 final class Calendar {
        private static final String[] PROJECTION = {
-               Calendars._ID,
+               BaseColumns._ID,
                Calendars.NAME,
                Calendars.CALENDAR_DISPLAY_NAME,
                Calendars.VISIBLE,
                Calendars.ACCOUNT_NAME,
                Calendars.ACCOUNT_TYPE,
+               Calendars.CALENDAR_COLOR,
        };
 
        /** Calendar ID */
-       public final int _id;
+       public final long _id;
        /** Calendar name */
        public final String name;
        /** Calendar display name */
@@ -25,16 +27,19 @@ final class Calendar {
        public final boolean visible;
        /** Name of the account used to sync this calendar */
        public final String accountName;
-       /** Type of the calendar used to sync this calendar */ 
+       /** Type of the calendar used to sync this calendar */
        public final String accountType;
+       /** Calendar colour */
+       public final int colour;
 
-       private Calendar(final int _id, final String name, final String displayName, final boolean visible, final String accountName, final String accountType) {
+       private Calendar(final long _id, final String name, final String displayName, final boolean visible, final String accountName, final String accountType, final int colour) {
                this._id=_id;
                this.name=name;
                this.displayName=displayName;
                this.visible=visible;
                this.accountName=accountName;
                this.accountType=accountType;
+               this.colour=colour;
        }
 
        public static Calendar[] getAllCalendars(final Context context){
@@ -42,8 +47,11 @@ final class Calendar {
                final Cursor cursor = cr.query(Calendars.CONTENT_URI, PROJECTION, null, null, null);
                cursor.moveToFirst();
                final Calendar[] calendars = new Calendar[cursor.getCount()];
-               for(int i=0;i<calendars.length;i++)
-                       calendars[i]=new Calendar(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getInt(3)!=0, cursor.getString(4), cursor.getString(5));
+               for(int i=0;i<calendars.length;i++){
+                       calendars[i]=new Calendar(cursor.getLong(0), cursor.getString(1), cursor.getString(2), cursor.getInt(3)!=0, cursor.getString(4), cursor.getString(5), cursor.getInt(6));
+                       cursor.moveToNext();
+               }
+               cursor.close();
                return calendars;
        }
 }