Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes for new sync.

Browse Source 
Add ContentValues-based RecurrenceSet processing.
Add test stub needed by SSL caching.
This commit is contained in:
Ken Shirriff
2009-07-06 10:45:38 -07:00
parent c2b9d63953
commit 3b95f53789
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
core/java/android/pim/RecurrenceSet.java
View File

@@ -223,6 +223,7 @@ public class RecurrenceSet {
return true;
}
// This can be removed when the old CalendarSyncAdapter is removed.
public static boolean populateComponent(Cursor cursor,
ICalendar.Component component) {
@@ -292,6 +293,64 @@ public class RecurrenceSet {
return true;
}
public static boolean populateComponent(ContentValues values,
ICalendar.Component component) {
long dtstart = -1;
if (values.containsKey(Calendar.Events.DTSTART)) {
dtstart = values.getAsLong(Calendar.Events.DTSTART);
}
String duration = values.getAsString(Calendar.Events.DURATION);
String tzid = values.getAsString(Calendar.Events.EVENT_TIMEZONE);
String rruleStr = values.getAsString(Calendar.Events.RRULE);
String rdateStr = values.getAsString(Calendar.Events.RDATE);
String exruleStr = values.getAsString(Calendar.Events.EXRULE);
String exdateStr = values.getAsString(Calendar.Events.EXDATE);
boolean allDay = values.getAsInteger(Calendar.Events.ALL_DAY) == 1;
if ((dtstart == -1) ||
(TextUtils.isEmpty(duration))||
((TextUtils.isEmpty(rruleStr))&&
(TextUtils.isEmpty(rdateStr)))) {
// no recurrence.
return false;
}
ICalendar.Property dtstartProp = new ICalendar.Property("DTSTART");
Time dtstartTime = null;
if (!TextUtils.isEmpty(tzid)) {
if (!allDay) {
dtstartProp.addParameter(new ICalendar.Parameter("TZID", tzid));
}
dtstartTime = new Time(tzid);
} else {
// use the "floating" timezone
dtstartTime = new Time(Time.TIMEZONE_UTC);
}
dtstartTime.set(dtstart);
// make sure the time is printed just as a date, if all day.
// TODO: android.pim.Time really should take care of this for us.
if (allDay) {
dtstartProp.addParameter(new ICalendar.Parameter("VALUE", "DATE"));
dtstartTime.allDay = true;
dtstartTime.hour = 0;
dtstartTime.minute = 0;
dtstartTime.second = 0;
}
dtstartProp.setValue(dtstartTime.format2445());
component.addProperty(dtstartProp);
ICalendar.Property durationProp = new ICalendar.Property("DURATION");
durationProp.setValue(duration);
component.addProperty(durationProp);
addPropertiesForRuleStr(component, "RRULE", rruleStr);
addPropertyForDateStr(component, "RDATE", rdateStr);
addPropertiesForRuleStr(component, "EXRULE", exruleStr);
addPropertyForDateStr(component, "EXDATE", exdateStr);
return true;
}
private static void addPropertiesForRuleStr(ICalendar.Component component,
String propertyName,
String ruleStr) {