From 9a8917d50c75ac2d7bb08a588bfeda637096494c Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 3 Jan 2012 15:34:19 -0800 Subject: [PATCH] Cleaned up a little ics calendar code (still not working) --- astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java index f61ec6594..73bad36b0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java @@ -25,14 +25,13 @@ public class Calendars { private static final String ID_COLUMN_NAME = "_id"; private static final boolean USE_ICS_NAMES = AndroidUtilities.getSdkVersion() >= 14; - private static final String ICS_CALENDAR_PREFIX = "calendar_"; - private static final String DISPLAY_COLUMN_NAME = (USE_ICS_NAMES ? ICS_CALENDAR_PREFIX : "") + "displayName"; - private static final String ACCES_LEVEL_COLUMN_NAME = (USE_ICS_NAMES ? ICS_CALENDAR_PREFIX : "") + "access_level"; + private static final String DISPLAY_COLUMN_NAME = (USE_ICS_NAMES ? CalendarContract.Calendars.CALENDAR_DISPLAY_NAME : "displayName"); + private static final String ACCES_LEVEL_COLUMN_NAME = (USE_ICS_NAMES ? CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL : "access_level"); private static final String[] CALENDARS_PROJECTION = new String[] { - ID_COLUMN_NAME, // Calendars._ID, - DISPLAY_COLUMN_NAME // Calendars.DISPLAY_NAME + ID_COLUMN_NAME, + DISPLAY_COLUMN_NAME, }; // Only show calendars that the user can modify. Access level 500