X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FCalendar.java;h=1ab1988a7d27aeb5974d3b90aeadc7e93f86fb29;hb=3ba21b0a3d20fb7fa49567637bbb71c76fb87e3e;hp=134fcd185d77099ef4e16d76463503cad38f4554;hpb=d022ee491d397c26149f166d4a8fc7a0f85b8f4b;p=unical.git

diff --git a/src/ro/ieval/unical/Calendar.java b/src/ro/ieval/unical/Calendar.java
index 134fcd1..1ab1988 100644
--- a/src/ro/ieval/unical/Calendar.java
+++ b/src/ro/ieval/unical/Calendar.java
@@ -3,16 +3,18 @@ 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 */
@@ -27,14 +29,17 @@ final class Calendar {
 	public final String accountName;
 	/** Type of the calendar used to sync this calendar */ 
 	public final String accountType;
+	/** Calendar colour */
+	public final int colour;
 
-	private Calendar(final long _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;
 	}
 }