update the end time if start time is after the end, close #115

SimpleMobileTools · Feb 19, 2017 · 0f7b950 · 0f7b950
1 parent 681dc87
commit 0f7b950
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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()