From 0f7b950e15c1fc61ca0d6b313f00874391af44c3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 19 Feb 2017 23:48:11 +0100 Subject: [PATCH] update the end time if start time is after the end, close #115 --- .../calendar/activities/EventActivity.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index dc1c61d0d..f2630cfeb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -364,6 +364,11 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { if (isStart) { mEventStartDateTime = mEventStartDateTime.withDate(year, month + 1, day) updateStartDate() + if (mEventStartDateTime.isAfter(mEventEndDateTime)) { + mEventEndDateTime = mEventStartDateTime + updateEndDate() + updateEndTime() + } } else { mEventEndDateTime = mEventEndDateTime.withDate(year, month + 1, day) updateEndDate() @@ -375,6 +380,10 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { if (isStart) { mEventStartDateTime = mEventStartDateTime.withHourOfDay(hours).withMinuteOfHour(minutes) updateStartTime() + if (mEventStartDateTime.isAfter(mEventEndDateTime)) { + mEventEndDateTime = mEventStartDateTime + updateEndTime() + } } else { mEventEndDateTime = mEventEndDateTime.withHourOfDay(hours).withMinuteOfHour(minutes) updateEndTime()