Merge change 22328 into eclair

* changes: Fix recurrence parsing for all-day events.
2009-08-21 15:58:43 -07:00
parent 7a1c20ad4b 1ce2e2e78d
commit 426ac065d0
1 changed files with 6 additions and 2 deletions
--- a/core/java/android/pim/RecurrenceSet.java
+++ b/core/java/android/pim/RecurrenceSet.java
@@ -410,10 +410,14 @@ public static boolean populateComponent(ContentValues values,

        Time end = new Time(endTzid);
        end.parse(dtendProperty.getValue());
-        long durationMillis = end.toMillis(false /* use isDst */) 
+        long durationMillis = end.toMillis(false /* use isDst */)
                - start.toMillis(false /* use isDst */);
        long durationSeconds = (durationMillis / 1000);
-        return "P" + durationSeconds + "S";
+        if (start.allDay && (durationSeconds % 86400) == 0) {
+            return "P" + (durationSeconds / 86400) + "D"; // Server wants this instead of P86400S
+        } else {
+            return "P" + durationSeconds + "S";
+        }
    }

    private static String flattenProperties(ICalendar.Component component,