fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

use a callback at updating events

Browse Source
This commit is contained in:
tibbi
2017-07-25 20:25:37 +02:00
parent 8ea163b439
commit d0eb958c9c
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@@ -478,7 +478,9 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
if (mRepeatInterval > 0 && wasRepeatable) { if (mRepeatInterval > 0 && wasRepeatable) {
EditRepeatingEventDialog(this) { EditRepeatingEventDialog(this) {
if (it) { if (it) {
dbHelper.update(mEvent) dbHelper.update(mEvent) {
eventUpdated()
}
} else { } else {
dbHelper.addEventRepeatException(mEvent.id, mEventOccurrenceTS) dbHelper.addEventRepeatException(mEvent.id, mEventOccurrenceTS)
mEvent.parentId = mEvent.id mEvent.parentId = mEvent.id
@@ -490,10 +492,17 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
} }
} }
} else { } else {
dbHelper.update(mEvent) dbHelper.update(mEvent) {
eventUpdated()
} }
} }
} }
}
private fun eventUpdated() {
toast(R.string.event_updated)
finish()
}
private fun updateStartTexts() { private fun updateStartTexts() {
updateStartDateText() updateStartDateText()
@@ -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) { override fun eventsDeleted(cnt: Int) {
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
View File

@@ -128,7 +128,7 @@ class FetchGoogleEventsTask(val activity: Activity, val googleSyncListener: Goog
} }
if (updateEvent) { if (updateEvent) {
dbHelper.update(event) dbHelper.update(event) {}
} else { } else {
importIDs.add(importId) importIDs.add(importId)
dbHelper.insert(event) {} dbHelper.insert(event) {}

3
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
View File

@@ -163,9 +163,6 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListen
override fun eventInserted(event: Event) { override fun eventInserted(event: Event) {
} }
override fun eventUpdated(event: Event) {
}
override fun eventsDeleted(cnt: Int) { override fun eventsDeleted(cnt: Int) {
(activity as DayActivity).recheckEvents() (activity as DayActivity).recheckEvents()
} }

4
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
View File

@@ -125,10 +125,6 @@ class EventListFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEvents
checkEvents() checkEvents()
} }
override fun eventUpdated(event: Event) {
checkEvents()
}
override fun eventsDeleted(cnt: Int) { override fun eventsDeleted(cnt: Int) {
checkEvents() checkEvents()
checkPlaceholderVisibility() checkPlaceholderVisibility()

6
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
View File

@@ -192,7 +192,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
callback(event.id) callback(event.id)
} }
fun update(event: Event) { fun update(event: Event, callback: () -> Unit) {
val selectionArgs = arrayOf(event.id.toString()) val selectionArgs = arrayOf(event.id.toString())
val values = fillEventValues(event) val values = fillEventValues(event)
val selection = "$COL_ID = ?" val selection = "$COL_ID = ?"
@@ -208,7 +208,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
context.updateWidgets() context.updateWidgets()
context.scheduleReminder(event, this) context.scheduleReminder(event, this)
mEventsListener?.eventUpdated(event) callback()
} }
private fun fillEventValues(event: Event): ContentValues { private fun fillEventValues(event: Event): ContentValues {
@@ -854,8 +854,6 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
interface EventUpdateListener { interface EventUpdateListener {
fun eventInserted(event: Event) fun eventInserted(event: Event)
fun eventUpdated(event: Event)
fun eventsDeleted(cnt: Int) fun eventsDeleted(cnt: Int)
fun gotEvents(events: MutableList<Event>) fun gotEvents(events: MutableList<Event>)