|
|
@ -118,11 +118,18 @@ public class CalendarHelper {
|
|
|
|
ICalDate start = (event.getDateStart() == null ? null : event.getDateStart().getValue());
|
|
|
|
ICalDate start = (event.getDateStart() == null ? null : event.getDateStart().getValue());
|
|
|
|
ICalDate end = (event.getDateEnd() == null ? null : event.getDateEnd().getValue());
|
|
|
|
ICalDate end = (event.getDateEnd() == null ? null : event.getDateEnd().getValue());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TimezoneInfo tzinfo = icalendar.getTimezoneInfo();
|
|
|
|
|
|
|
|
TimezoneAssignment tza = (tzinfo == null ? null : tzinfo.getTimezone(event.getDateStart()));
|
|
|
|
|
|
|
|
TimeZone tz = (tza == null ? null : tza.getTimeZone());
|
|
|
|
|
|
|
|
//if (tz != null && "W. Europe Standard Time".equals(tz.getID()))
|
|
|
|
|
|
|
|
// tz.setID("GMT");
|
|
|
|
|
|
|
|
String tzid = (tz == null ? TimeZone.getDefault().getID() : tz.getID());
|
|
|
|
|
|
|
|
|
|
|
|
String rrule = null;
|
|
|
|
String rrule = null;
|
|
|
|
RecurrenceRule recurrence = event.getRecurrenceRule();
|
|
|
|
RecurrenceRule recurrence = event.getRecurrenceRule();
|
|
|
|
if (recurrence != null) {
|
|
|
|
if (recurrence != null) {
|
|
|
|
RecurrenceRuleScribe scribe = new RecurrenceRuleScribe();
|
|
|
|
RecurrenceRuleScribe scribe = new RecurrenceRuleScribe();
|
|
|
|
WriteContext wcontext = new WriteContext(ICalVersion.V2_0, icalendar.getTimezoneInfo(), null);
|
|
|
|
WriteContext wcontext = new WriteContext(ICalVersion.V2_0, tzinfo, null);
|
|
|
|
rrule = scribe.writeText(recurrence, wcontext);
|
|
|
|
rrule = scribe.writeText(recurrence, wcontext);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -163,11 +170,7 @@ public class CalendarHelper {
|
|
|
|
values.put(CalendarContract.Events.ORGANIZER, organizer);
|
|
|
|
values.put(CalendarContract.Events.ORGANIZER, organizer);
|
|
|
|
|
|
|
|
|
|
|
|
// Assume one time zone
|
|
|
|
// Assume one time zone
|
|
|
|
TimezoneInfo tzinfo = icalendar.getTimezoneInfo();
|
|
|
|
values.put(CalendarContract.Events.EVENT_TIMEZONE, tzid);
|
|
|
|
TimezoneAssignment tza = (tzinfo == null ? null : tzinfo.getTimezone(event.getDateStart()));
|
|
|
|
|
|
|
|
TimeZone tz = (tza == null ? null : tza.getTimeZone());
|
|
|
|
|
|
|
|
values.put(CalendarContract.Events.EVENT_TIMEZONE,
|
|
|
|
|
|
|
|
tz == null ? TimeZone.getDefault().getID() : tz.getID());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
values.put(CalendarContract.Events.DTSTART, start.getTime());
|
|
|
|
values.put(CalendarContract.Events.DTSTART, start.getTime());
|
|
|
|
values.put(CalendarContract.Events.DTEND, end.getTime());
|
|
|
|
values.put(CalendarContract.Events.DTEND, end.getTime());
|
|
|
@ -191,7 +194,7 @@ public class CalendarHelper {
|
|
|
|
" id=" + calId + ":" + eventId +
|
|
|
|
" id=" + calId + ":" + eventId +
|
|
|
|
" uid=" + uid +
|
|
|
|
" uid=" + uid +
|
|
|
|
" organizer=" + organizer +
|
|
|
|
" organizer=" + organizer +
|
|
|
|
" tz=" + (tz == null ? null : tz.getID()) +
|
|
|
|
" tz=" + tzid +
|
|
|
|
" start=" + new Date(start.getTime()) +
|
|
|
|
" start=" + new Date(start.getTime()) +
|
|
|
|
" end=" + new Date(end.getTime()) +
|
|
|
|
" end=" + new Date(end.getTime()) +
|
|
|
|
" rrule=" + rrule +
|
|
|
|
" rrule=" + rrule +
|
|
|
@ -205,7 +208,7 @@ public class CalendarHelper {
|
|
|
|
" id=" + calId + ":" + existId +
|
|
|
|
" id=" + calId + ":" + existId +
|
|
|
|
" uid=" + uid +
|
|
|
|
" uid=" + uid +
|
|
|
|
" organizer=" + organizer +
|
|
|
|
" organizer=" + organizer +
|
|
|
|
" tz=" + (tz == null ? null : tz.getID()) +
|
|
|
|
" tz=" + tzid +
|
|
|
|
" start=" + new Date(start.getTime()) +
|
|
|
|
" start=" + new Date(start.getTime()) +
|
|
|
|
" end=" + new Date(end.getTime()) +
|
|
|
|
" end=" + new Date(end.getTime()) +
|
|
|
|
" rrule=" + rrule +
|
|
|
|
" rrule=" + rrule +
|
|
|
|