wbrawner/Simple-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating events parentId to Long

Browse source
This commit is contained in:
tibbi 2018-11-11 14:49:21 +01:00
parent 94abbaebf5
commit e535072247
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View file

@ -777,7 +777,7 @@ class EventActivity : SimpleActivity() {
} else { } else {
dbHelper.addEventRepeatException(mEvent.id!!, mEventOccurrenceTS, true) dbHelper.addEventRepeatException(mEvent.id!!, mEventOccurrenceTS, true)
mEvent.apply { mEvent.apply {
parentId = id!! parentId = id!!.toLong()
id = null id = null
repeatRule = 0 repeatRule = 0
repeatInterval = 0 repeatInterval = 0

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHandler.kt
View file

@ -236,7 +236,7 @@ class CalDAVHandler(val context: Context) {
val parentImportId = "$source-$originalId" val parentImportId = "$source-$originalId"
val parentEventId = context.dbHelper.getEventIdWithImportId(parentImportId) val parentEventId = context.dbHelper.getEventIdWithImportId(parentImportId)
if (parentEventId != 0) { if (parentEventId != 0) {
event.parentId = parentEventId event.parentId = parentEventId.toLong()
context.dbHelper.addEventRepeatException(parentEventId, (originalInstanceTime / 1000).toInt(), false, event.importId) context.dbHelper.addEventRepeatException(parentEventId, (originalInstanceTime / 1000).toInt(), false, event.importId)
} }
} }

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

@ -124,7 +124,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
val id = mDb.insert(MAIN_TABLE_NAME, null, eventValues) val id = mDb.insert(MAIN_TABLE_NAME, null, eventValues)
event.id = id.toInt() event.id = id.toInt()
if (event.repeatInterval != 0 && event.parentId == 0) { if (event.repeatInterval != 0 && event.parentId == 0L) {
val metaValues = fillMetaValues(event) val metaValues = fillMetaValues(event)
mDb.insert(META_TABLE_NAME, null, metaValues) mDb.insert(META_TABLE_NAME, null, metaValues)
} }
@ -151,7 +151,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
val id = mDb.insert(MAIN_TABLE_NAME, null, eventValues) val id = mDb.insert(MAIN_TABLE_NAME, null, eventValues)
event.id = id.toInt() event.id = id.toInt()
if (event.repeatInterval != 0 && event.parentId == 0) { if (event.repeatInterval != 0 && event.parentId == 0L) {
val metaValues = fillMetaValues(event) val metaValues = fillMetaValues(event)
mDb.insert(META_TABLE_NAME, null, metaValues) mDb.insert(META_TABLE_NAME, null, metaValues)
} }
@ -271,7 +271,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
childEvent.apply { childEvent.apply {
id = 0 id = 0
parentId = parentEventId parentId = parentEventId.toLong()
startTS = 0 startTS = 0
endTS = 0 endTS = 0
if (childImportId != null) { if (childImportId != null) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/Event.kt
View file

@ -11,7 +11,7 @@ data class Event(var id: Int?, var startTS: Int = 0, var endTS: Int = 0, var tit
var reminder1Minutes: Int = -1, var reminder2Minutes: Int = -1, var reminder3Minutes: Int = -1, var repeatInterval: Int = 0, var reminder1Minutes: Int = -1, var reminder2Minutes: Int = -1, var reminder3Minutes: Int = -1, var repeatInterval: Int = 0,
var importId: String = "", var flags: Int = 0, var repeatLimit: Int = 0, var repeatRule: Int = 0, var importId: String = "", var flags: Int = 0, var repeatLimit: Int = 0, var repeatRule: Int = 0,
var eventType: Long = DBHelper.REGULAR_EVENT_TYPE_ID, var ignoreEventOccurrences: ArrayList<Int> = ArrayList(), var eventType: Long = DBHelper.REGULAR_EVENT_TYPE_ID, var ignoreEventOccurrences: ArrayList<Int> = ArrayList(),
var offset: String = "", var isDstIncluded: Boolean = false, var parentId: Int = 0, var lastUpdated: Long = 0L, var offset: String = "", var isDstIncluded: Boolean = false, var parentId: Long = 0, var lastUpdated: Long = 0L,
var source: String = SOURCE_SIMPLE_CALENDAR, var color: Int = 0, var location: String = "", var isPastEvent: Boolean = false) var source: String = SOURCE_SIMPLE_CALENDAR, var color: Int = 0, var location: String = "", var isPastEvent: Boolean = false)
: Serializable { : Serializable {