From 34b8fce5c487d06b943812c3ed1464e090f352e5 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 6 Sep 2018 16:28:52 +0100 Subject: [PATCH] Move to the new method of getting end date. This also fixes the issues with events having both an end date and duration. --- .../etesync/syncadapter/syncadapter/CalendarSyncManager.java | 2 +- ical4android | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java index b1467bbc..c51e4fe7 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java @@ -227,7 +227,7 @@ public class CalendarSyncManager extends SyncManager { new SimpleDateFormat(dateFormatString, Locale.US); Date startDate = event.dtStart.getDate(); - Date endDate = event.dtEnd.getDate(); + Date endDate = event.getEndDate(true).getDate(); Calendar cal1 = Calendar.getInstance(); Calendar cal2 = Calendar.getInstance(); cal1.setTime(startDate); diff --git a/ical4android b/ical4android index bf0336bb..13282134 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit bf0336bbae0321734464f100ed912c73731f8685 +Subproject commit 13282134362f3eb010124762949bc426ee7400c6