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 2d9415675..de51bcd5b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -478,7 +478,9 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { if (mRepeatInterval > 0 && wasRepeatable) { EditRepeatingEventDialog(this) { if (it) { - dbHelper.update(mEvent) + dbHelper.update(mEvent) { + eventUpdated() + } } else { dbHelper.addEventRepeatException(mEvent.id, mEventOccurrenceTS) mEvent.parentId = mEvent.id @@ -490,11 +492,18 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { } } } else { - dbHelper.update(mEvent) + dbHelper.update(mEvent) { + eventUpdated() + } } } } + private fun eventUpdated() { + toast(R.string.event_updated) + finish() + } + private fun updateStartTexts() { updateStartDateText() updateStartTimeText() @@ -635,11 +644,6 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { } - override fun eventUpdated(event: Event) { - toast(R.string.event_updated) - finish() - } - override fun eventsDeleted(cnt: Int) { } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt index df6cffb26..2e87f4a1e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt @@ -128,7 +128,7 @@ class FetchGoogleEventsTask(val activity: Activity, val googleSyncListener: Goog } if (updateEvent) { - dbHelper.update(event) + dbHelper.update(event) {} } else { importIDs.add(importId) dbHelper.insert(event) {} diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt index 13e18e3d7..e28dd8868 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -163,9 +163,6 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListen override fun eventInserted(event: Event) { } - override fun eventUpdated(event: Event) { - } - override fun eventsDeleted(cnt: Int) { (activity as DayActivity).recheckEvents() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt index 164acb053..001ac7ac6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt @@ -125,10 +125,6 @@ class EventListFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEvents checkEvents() } - override fun eventUpdated(event: Event) { - checkEvents() - } - override fun eventsDeleted(cnt: Int) { checkEvents() checkPlaceholderVisibility() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt index 9d66c543f..a557aabe3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -192,7 +192,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont callback(event.id) } - fun update(event: Event) { + fun update(event: Event, callback: () -> Unit) { val selectionArgs = arrayOf(event.id.toString()) val values = fillEventValues(event) val selection = "$COL_ID = ?" @@ -208,7 +208,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont context.updateWidgets() context.scheduleReminder(event, this) - mEventsListener?.eventUpdated(event) + callback() } private fun fillEventValues(event: Event): ContentValues { @@ -854,8 +854,6 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont interface EventUpdateListener { fun eventInserted(event: Event) - fun eventUpdated(event: Event) - fun eventsDeleted(cnt: Int) fun gotEvents(events: MutableList)