Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 03:15:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Auto event: process time zone

Browse Source
This commit is contained in:
M66B
2023-03-31 12:45:46 +02:00
parent 3958f1ef95
commit 4e2ccf7312
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/CalendarHelper.java
View File

@@ -40,6 +40,8 @@ import java.util.TimeZone;
import biweekly.ICalVersion;
import biweekly.ICalendar;
import biweekly.component.VEvent;
import biweekly.io.TimezoneAssignment;
import biweekly.io.TimezoneInfo;
import biweekly.io.WriteContext;
import biweekly.io.scribe.property.RecurrenceRuleScribe;
import biweekly.parameter.ParticipationStatus;
@@ -98,7 +100,7 @@ public class CalendarHelper {
if (!TextUtils.isEmpty(uid)) {
Long existId = exists(context, selectedAccount, selectedName, uid);
if (existId != null) {
EntityLog.log(context, EntityLog.Type.General, message, "Exists uid=" + uid + " id=" + existId);
EntityLog.log(context, EntityLog.Type.General, message, "Event exists uid=" + uid + " id=" + existId);
return existId;
}
}
@@ -155,11 +157,20 @@ public class CalendarHelper {
values.put(CalendarContract.Events.UID_2445, uid);
if (!TextUtils.isEmpty(organizer))
values.put(CalendarContract.Events.ORGANIZER, organizer);
values.put(CalendarContract.Events.EVENT_TIMEZONE, TimeZone.getDefault().getID());
// Assume one time zone
TimezoneInfo tzinfo = icalendar.getTimezoneInfo();
TimezoneAssignment tza = (tzinfo == null ? null : tzinfo.getTimezone(event.getDateStart()));
TimeZone tz = (tza == null ? null : tza.getTimeZone());
if (tz != null)
values.put(CalendarContract.Events.EVENT_TIMEZONE, tz.getID());
values.put(CalendarContract.Events.DTSTART, start.getTime());
values.put(CalendarContract.Events.DTEND, end.getTime());
if (rrule != null)
values.put(CalendarContract.Events.RRULE, rrule);
if (!TextUtils.isEmpty(summary))
values.put(CalendarContract.Events.TITLE, summary);
if (!TextUtils.isEmpty(description))
@@ -174,7 +185,7 @@ public class CalendarHelper {
" id=" + calId + ":" + eventId +
" uid=" + uid +
" organizer=" + organizer +
" tz=" + TimeZone.getDefault().getID() +
" tz=" + (tz == null ? null : tz.getID()) +
" start=" + new Date(start.getTime()) +
" end=" + new Date(end.getTime()) +
" rrule=" + rrule +