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

change the dbhelper constructor

Browse Source
This commit is contained in:
tibbi
2017-02-11 11:38:18 +01:00
parent 7e4429df6b
commit 1c80ffee7b
11 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
mDialogTheme = getAppropriateTheme() mDialogTheme = getAppropriateTheme()
val eventId = intent.getIntExtra(EVENT_ID, 0) val eventId = intent.getIntExtra(EVENT_ID, 0)
val event = DBHelper(applicationContext).getEvent(eventId) val event = DBHelper.newInstance(applicationContext).getEvent(eventId)
if (event != null) { if (event != null) {
mEvent = event mEvent = event
setupEditEvent() setupEditEvent()
@@ -253,7 +253,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
private fun deleteEvent() { private fun deleteEvent() {
ConfirmationDialog(this) { ConfirmationDialog(this) {
DBHelper(applicationContext, this).deleteEvents(arrayOf(mEvent.id.toString())) DBHelper.newInstance(applicationContext, this).deleteEvents(arrayOf(mEvent.id.toString()))
finish() finish()
} }
} }
@@ -275,7 +275,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
} }
val reminders = sortedSetOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes).filter { it != REMINDER_OFF } val reminders = sortedSetOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes).filter { it != REMINDER_OFF }
val dbHelper = DBHelper(applicationContext, this) val dbHelper = DBHelper.newInstance(applicationContext, this)
val newDescription = event_description.value val newDescription = event_description.value
mEvent.apply { mEvent.apply {
startTS = newStartTS startTS = newStartTS

2
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
View File

@@ -107,7 +107,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV
override fun onDataSetChanged() { override fun onDataSetChanged() {
val fromTS = DateTime().seconds() val fromTS = DateTime().seconds()
val toTS = DateTime().plusYears(1).seconds() val toTS = DateTime().plusYears(1).seconds()
DBHelper(context).getEventsInBackground(fromTS, toTS, object : DBHelper.GetEventsListener { DBHelper.newInstance(context).getEventsInBackground(fromTS, toTS, object : DBHelper.GetEventsListener {
override fun gotEvents(events: MutableList<Event>) { override fun gotEvents(events: MutableList<Event>) {
val listItems = ArrayList<ListItem>(events.size) val listItems = ArrayList<ListItem>(events.size)
val sorted = events.sortedWith(compareBy({ it.startTS }, { it.endTS }, { it.title }, { it.description })) val sorted = events.sortedWith(compareBy({ it.startTS }, { it.endTS }, { it.title }, { it.description }))

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

@@ -114,7 +114,7 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DBHelper.GetEvents
fun checkEvents() { fun checkEvents() {
val startTS = Formatter.getDayStartTS(mDayCode) val startTS = Formatter.getDayStartTS(mDayCode)
val endTS = Formatter.getDayEndTS(mDayCode) val endTS = Formatter.getDayEndTS(mDayCode)
DBHelper(context, this).getEvents(startTS, endTS, this) DBHelper.newInstance(context, this).getEvents(startTS, endTS, this)
} }
private fun updateEvents(events: MutableList<Event>) { private fun updateEvents(events: MutableList<Event>) {
@@ -139,7 +139,7 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DBHelper.GetEvents
override fun deleteEvents(ids: ArrayList<Int>) { override fun deleteEvents(ids: ArrayList<Int>) {
val eventIDs = Array(ids.size, { i -> (ids[i].toString()) }) val eventIDs = Array(ids.size, { i -> (ids[i].toString()) })
DBHelper(activity.applicationContext, this).deleteEvents(eventIDs) DBHelper.newInstance(activity.applicationContext, this).deleteEvents(eventIDs)
} }
override fun eventInserted(event: Event) { override fun eventInserted(event: Event) {

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

@@ -47,7 +47,7 @@ class EventListFragment : Fragment(), DBHelper.GetEventsListener, DBHelper.Event
private fun checkEvents() { private fun checkEvents() {
val fromTS = DateTime().seconds() val fromTS = DateTime().seconds()
val toTS = DateTime().plusYears(1).seconds() val toTS = DateTime().plusYears(1).seconds()
DBHelper(context).getEvents(fromTS, toTS, this) DBHelper.newInstance(context).getEvents(fromTS, toTS, this)
} }
override fun gotEvents(events: MutableList<Event>) { override fun gotEvents(events: MutableList<Event>) {
@@ -101,7 +101,7 @@ class EventListFragment : Fragment(), DBHelper.GetEventsListener, DBHelper.Event
override fun deleteEvents(ids: ArrayList<Int>) { override fun deleteEvents(ids: ArrayList<Int>) {
val eventIDs = Array(ids.size, { i -> (ids[i].toString()) }) val eventIDs = Array(ids.size, { i -> (ids[i].toString()) })
DBHelper(activity.applicationContext, this).deleteEvents(eventIDs) DBHelper.newInstance(activity.applicationContext, this).deleteEvents(eventIDs)
} }
override fun eventInserted(event: Event) { override fun eventInserted(event: Event) {

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

@@ -16,7 +16,7 @@ import com.simplemobiletools.commons.extensions.getStringValue
import org.joda.time.DateTime import org.joda.time.DateTime
import java.util.* import java.util.*
class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) { class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) {
private val MAIN_TABLE_NAME = "events" private val MAIN_TABLE_NAME = "events"
private val COL_ID = "id" private val COL_ID = "id"
private val COL_START_TS = "start_ts" private val COL_START_TS = "start_ts"
@@ -43,18 +43,16 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V
private val COL_TYPE_TITLE = "event_type_title" private val COL_TYPE_TITLE = "event_type_title"
private val COL_TYPE_COLOR = "event_type_color" private val COL_TYPE_COLOR = "event_type_color"
private var mEventsListener: EventUpdateListener? = null
private var context: Context? = null
companion object { companion object {
private val DB_NAME = "events.db" private val DB_NAME = "events.db"
private val DB_VERSION = 7 private val DB_VERSION = 7
lateinit private var mDb: SQLiteDatabase lateinit private var mDb: SQLiteDatabase
} private var mEventsListener: EventUpdateListener? = null
constructor(context: Context, callback: EventUpdateListener?) : this(context) { fun newInstance(context: Context, callback: EventUpdateListener? = null): DBHelper {
mEventsListener = callback mEventsListener = callback
this.context = context return DBHelper(context)
}
} }
init { init {
@@ -106,6 +104,11 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_V
private fun createTypesTable(db: SQLiteDatabase) { private fun createTypesTable(db: SQLiteDatabase) {
db.execSQL("CREATE TABLE $TYPES_TABLE_NAME ($COL_TYPE_ID INTEGER PRIMARY KEY, $COL_TYPE_TITLE TEXT, $COL_TYPE_COLOR INTEGER)") db.execSQL("CREATE TABLE $TYPES_TABLE_NAME ($COL_TYPE_ID INTEGER PRIMARY KEY, $COL_TYPE_TITLE TEXT, $COL_TYPE_COLOR INTEGER)")
addRegularEventType(db)
}
private fun addRegularEventType(db: SQLiteDatabase) {
} }
fun insert(event: Event, insertListener: (event: Event) -> Unit) { fun insert(event: Event, insertListener: (event: Event) -> Unit) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsParser.kt
View File

@@ -34,7 +34,7 @@ class IcsParser {
fun parseIcs(context: Context, reminderMinutes: Int, path: String): ImportResult { fun parseIcs(context: Context, reminderMinutes: Int, path: String): ImportResult {
try { try {
val dbHelper = DBHelper(context) val dbHelper = DBHelper.newInstance(context)
val importIDs = dbHelper.getImportIds() val importIDs = dbHelper.getImportIds()
File(path).inputStream().bufferedReader().use { File(path).inputStream().bufferedReader().use {

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
View File

@@ -26,7 +26,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
mTargetDate = targetDate mTargetDate = targetDate
val startTS = mTargetDate.minusMonths(1).seconds() val startTS = mTargetDate.minusMonths(1).seconds()
val endTS = mTargetDate.plusMonths(1).seconds() val endTS = mTargetDate.plusMonths(1).seconds()
DBHelper(mContext).getEvents(startTS, endTS, this) DBHelper.newInstance(mContext).getEvents(startTS, endTS, this)
} }
fun getPrevMonth() { fun getPrevMonth() {

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/WeeklyCalendarImpl.kt
View File

@@ -15,7 +15,7 @@ class WeeklyCalendarImpl(val mCallback: WeeklyCalendar, val mContext: Context) :
fun updateWeeklyCalendar(weekStartTS: Int) { fun updateWeeklyCalendar(weekStartTS: Int) {
val startTS = weekStartTS val startTS = weekStartTS
val endTS = startTS + WEEK_SECONDS val endTS = startTS + WEEK_SECONDS
DBHelper(mContext).getEvents(startTS, endTS, this) DBHelper.newInstance(mContext).getEvents(startTS, endTS, this)
} }
override fun gotEvents(events: MutableList<Event>) { override fun gotEvents(events: MutableList<Event>) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/YearlyCalendarImpl.kt
View File

@@ -14,7 +14,7 @@ class YearlyCalendarImpl(val callback: YearlyCalendar, val context: Context, val
val startDateTime = DateTime().withTime(0, 0, 0, 0).withDate(year, 1, 1) val startDateTime = DateTime().withTime(0, 0, 0, 0).withDate(year, 1, 1)
val startTS = startDateTime.seconds() val startTS = startDateTime.seconds()
val endTS = startDateTime.plusYears(1).minusSeconds(1).seconds() val endTS = startDateTime.plusYears(1).minusSeconds(1).seconds()
DBHelper(context).getEvents(startTS, endTS, this) DBHelper.newInstance(context).getEvents(startTS, endTS, this)
} }
override fun gotEvents(events: MutableList<Event>) { override fun gotEvents(events: MutableList<Event>) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/BootCompletedReceiver.kt
View File

@@ -9,7 +9,7 @@ import com.simplemobiletools.calendar.helpers.DBHelper
class BootCompletedReceiver : BroadcastReceiver() { class BootCompletedReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, arg1: Intent) { override fun onReceive(context: Context, arg1: Intent) {
val events = DBHelper(context).getEventsAtReboot() val events = DBHelper.newInstance(context).getEventsAtReboot()
for (event in events) { for (event in events) {
context.scheduleNextEventReminder(event) context.scheduleNextEventReminder(event)
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
View File

@@ -25,7 +25,7 @@ class NotificationReceiver : BroadcastReceiver() {
if (id == -1) if (id == -1)
return return
val event = DBHelper(context).getEvent(id) val event = DBHelper.newInstance(context).getEvent(id)
if (event == null || event.getReminders().isEmpty()) if (event == null || event.getReminders().isEmpty())
return return