From 93a901a3364157f638954d53fc16a527ad4ed1ea Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 19 Nov 2016 17:12:38 +0100 Subject: [PATCH] update the widget from the helper if an event changes --- .../simplemobiletools/calendar/activities/EventActivity.kt | 3 --- .../com/simplemobiletools/calendar/fragments/DayFragment.kt | 4 ---- .../calendar/fragments/EventListFragment.kt | 4 ---- .../com/simplemobiletools/calendar/helpers/DBHelper.kt | 6 ++++++ 4 files changed, 6 insertions(+), 11 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 6c7f844ee..33751ccd3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -365,19 +365,16 @@ class EventActivity : SimpleActivity(), DBHelper.EventsListener { toast(R.string.event_added) } scheduleNotification(event) - updateWidget() finish() } override fun eventUpdated(event: Event) { scheduleNotification(event) toast(R.string.event_updated) - updateWidget() finish() } override fun eventsDeleted(cnt: Int) { - updateWidget() } override fun gotEvents(events: MutableList) { 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 da89e64dc..f091ec439 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -17,7 +17,6 @@ import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.EventActivity import com.simplemobiletools.calendar.adapters.EventsAdapter import com.simplemobiletools.calendar.extensions.adjustAlpha -import com.simplemobiletools.calendar.extensions.updateWidget import com.simplemobiletools.calendar.helpers.* import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.interfaces.NavigationListener @@ -220,16 +219,13 @@ class DayFragment : Fragment(), DBHelper.EventsListener, AdapterView.OnItemClick } override fun eventInserted(event: Event) { - context.updateWidget() } override fun eventUpdated(event: Event) { - context.updateWidget() } override fun eventsDeleted(cnt: Int) { checkEvents() - context.updateWidget() } override fun gotEvents(events: MutableList) { 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 8e4d7b97b..5048a16a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt @@ -14,7 +14,6 @@ import com.simplemobiletools.calendar.activities.MainActivity import com.simplemobiletools.calendar.adapters.EventsListAdapter import com.simplemobiletools.calendar.extensions.beGoneIf import com.simplemobiletools.calendar.extensions.beVisibleIf -import com.simplemobiletools.calendar.extensions.updateWidget import com.simplemobiletools.calendar.helpers.DBHelper import com.simplemobiletools.calendar.helpers.EVENT_ID import com.simplemobiletools.calendar.helpers.Formatter @@ -185,17 +184,14 @@ class EventListFragment : Fragment(), DBHelper.GetEventsListener, AdapterView.On override fun eventInserted(event: Event) { checkEvents() - context.updateWidget() } override fun eventUpdated(event: Event) { checkEvents() - context.updateWidget() } override fun eventsDeleted(cnt: Int) { checkPlaceholderVisibility() - context.updateWidget() } interface DeleteListener : NavigationListener { 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 754a20a06..bbab74fb1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -9,6 +9,7 @@ import android.database.sqlite.SQLiteQueryBuilder import android.text.TextUtils import com.simplemobiletools.calendar.extensions.getIntValue import com.simplemobiletools.calendar.extensions.getStringValue +import com.simplemobiletools.calendar.extensions.updateWidget import com.simplemobiletools.calendar.models.Event import org.joda.time.DateTime import java.util.* @@ -30,6 +31,7 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V private val COL_REPEAT_DAY = "repeat_day" private var mEventsListener: EventsListener? = null + private var context: Context? = null companion object { private val DB_NAME = "events.db" @@ -39,6 +41,7 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V constructor(context: Context, callback: EventsListener?) : this(context) { mEventsListener = callback + this.context = context } init { @@ -76,6 +79,7 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V mDb.insert(META_TABLE_NAME, null, metaValues) } + context?.updateWidget() mEventsListener?.eventInserted(event) } @@ -93,6 +97,7 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V mDb.insertWithOnConflict(META_TABLE_NAME, null, metaValues, SQLiteDatabase.CONFLICT_REPLACE) } + context?.updateWidget() mEventsListener?.eventUpdated(event) } @@ -133,6 +138,7 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V val metaSelection = "$COL_EVENT_ID IN ($args)" mDb.delete(META_TABLE_NAME, metaSelection, null) + context?.updateWidget() mEventsListener?.eventsDeleted(ids.size) }