From 261d6a6ccc847c945ee0c9f3479a9e71250b3256 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 5 Apr 2017 23:18:38 +0200 Subject: [PATCH] remove the redundant event insert anonymous callback --- .../com/simplemobiletools/calendar/activities/EventActivity.kt | 2 +- .../kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt | 3 +-- .../com/simplemobiletools/calendar/helpers/IcsImporter.kt | 2 +- 3 files changed, 3 insertions(+), 4 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 index fd4ceb5b8..b15586170 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -301,7 +301,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { } if (mEvent.id == 0) { - dbHelper.insert(mEvent) {} + dbHelper.insert(mEvent) } else { dbHelper.update(mEvent) } 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 9a7b9c98a..2b937d5e1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -131,7 +131,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont addEventType(eventType, db) } - fun insert(event: Event, insertListener: (event: Event) -> Unit) { + fun insert(event: Event) { if (event.startTS > event.endTS || event.title.trim().isEmpty()) return @@ -147,7 +147,6 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont context.updateWidgets() context.scheduleReminder(event) mEventsListener?.eventInserted(event) - insertListener.invoke(event) } fun update(event: Event) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt index 68199c7bf..5a1b5495a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt @@ -84,7 +84,7 @@ class IcsImporter { val event = Event(0, curStart, curEnd, curTitle, curDescription, curReminderMinutes.getOrElse(0, { -1 }), curReminderMinutes.getOrElse(1, { -1 }), curReminderMinutes.getOrElse(2, { -1 }), curRepeatInterval, curImportId, curFlags, curRepeatLimit, curEventType) - context.dbHelper.insert(event) { } + context.dbHelper.insert(event) eventsImported++ resetValues() }