commit eea01ce34f9d965d6186c78271d05a1e246c1caf
author The Android Open Source Project <initial-contribution@android.com> Fri Jan 09 17:51:20 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Jan 09 17:51:20 2009 -0800
tree 654aa4b27bac9d3c83a9573b484e8454fab09245
parent 0357501f6b30a351059a74517220528036982202

auto import from //branches/cupcake/...@125939

src/com/google/wireless/gdata/calendar/data/CalendarEntry.java

diff --git a/src/com/google/wireless/gdata/calendar/data/CalendarEntry.java b/src/com/google/wireless/gdata/calendar/data/CalendarEntry.java
index 098b88c..6e49a9f 100644
--- a/src/com/google/wireless/gdata/calendar/data/CalendarEntry.java
+++ b/src/com/google/wireless/gdata/calendar/data/CalendarEntry.java
@@ -27,10 +27,9 @@
     public static final byte ACCESS_FREEBUSY = 2;
     
     /**
-     * Access level constant indicating the user can contribute (read and write) 
-     * to this calendar.
+     * Access level constant indicating the user can edit this calendar.
      */
-    public static final byte ACCESS_CONTRIBUTOR = 3;
+    public static final byte ACCESS_EDITOR = 3;
     
     /**
      * Access level constant indicating the user owns this calendar.

src/com/google/wireless/gdata/calendar/parser/xml/XmlCalendarsGDataParser.java

diff --git a/src/com/google/wireless/gdata/calendar/parser/xml/XmlCalendarsGDataParser.java b/src/com/google/wireless/gdata/calendar/parser/xml/XmlCalendarsGDataParser.java
index 2879780..431fd43 100644
--- a/src/com/google/wireless/gdata/calendar/parser/xml/XmlCalendarsGDataParser.java
+++ b/src/com/google/wireless/gdata/calendar/parser/xml/XmlCalendarsGDataParser.java
@@ -74,7 +74,11 @@
             } else if ("freebusy".equals(accesslevelStr)) {
                 accesslevel = CalendarEntry.ACCESS_FREEBUSY;
             } else if ("contributor".equals(accesslevelStr)) {
-                accesslevel = CalendarEntry.ACCESS_CONTRIBUTOR;
+                // contributor is the access level that used to be used, but it seems to have
+                // been deprecated in favor of "editor".
+                accesslevel = CalendarEntry.ACCESS_EDITOR;
+            } else if ("editor".equals(accesslevelStr)) {
+                accesslevel = CalendarEntry.ACCESS_EDITOR;
             } else if ("owner".equals(accesslevelStr)) {
                 accesslevel = CalendarEntry.ACCESS_OWNER;
             }

src/com/google/wireless/gdata/calendar/parser/xml/XmlEventsGDataParser.java

diff --git a/src/com/google/wireless/gdata/calendar/parser/xml/XmlEventsGDataParser.java b/src/com/google/wireless/gdata/calendar/parser/xml/XmlEventsGDataParser.java
index 6135d1b..7ec447e 100644
--- a/src/com/google/wireless/gdata/calendar/parser/xml/XmlEventsGDataParser.java
+++ b/src/com/google/wireless/gdata/calendar/parser/xml/XmlEventsGDataParser.java
@@ -64,6 +64,13 @@
         return new EventEntry();
     }
 
+    @Override
+    protected void handleEntry(Entry entry) throws XmlPullParserException,
+            IOException, ParseException {
+        hasSeenReminder = false; // Reset the state for the new entry
+        super.handleEntry(entry);
+    }
+
     protected void handleExtraElementInFeed(Feed feed)
             throws XmlPullParserException, IOException {
         XmlPullParser parser = getParser();