Make CaldavTask.id immutable

pull/2349/head
Alex Baker 1 year ago
parent 52d664856d
commit e1aed0f1af

@ -202,9 +202,12 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
if (task.parent > 0) {
caldavTask.remoteParent = caldavDao.getRemoteIdForTask(task.parent)
}
caldavTask.id = caldavDao.insert(caldavTask)
tasks.add(
t.copy(caldavTask = caldavTask)
t.copy(
caldavTask = caldavTask.copy(
id = caldavDao.insert(caldavTask)
)
)
)
}
}

@ -152,9 +152,12 @@ class CaldavDaoShiftTests : InjectingTestCase() {
if (task.parent > 0) {
caldavTask.remoteParent = caldavDao.getRemoteIdForTask(task.parent)
}
caldavTask.id = caldavDao.insert(caldavTask)
tasks.add(
t.copy(caldavTask = caldavTask)
t.copy(
caldavTask = caldavTask.copy(
id = caldavDao.insert(caldavTask)
)
)
)
}
}

@ -302,7 +302,7 @@ open class TaskAdapter(
calendar = list,
)
newTask.remoteParent = caldavTask.remoteParent
caldavTask.id = caldavDao.insert(newTask)
caldavDao.insert(newTask)
} else {
caldavDao.update(caldavTask)
}

@ -267,7 +267,7 @@ class iCalendar @Inject constructor(
caldavTask.lastSync = task.modificationDate
}
if (isNew) {
caldavTask.id = caldavDao.insert(caldavTask)
caldavDao.insert(caldavTask)
Timber.d("NEW %s", caldavTask)
} else {
caldavDao.update(caldavTask)

@ -23,7 +23,7 @@ data class CaldavTask(
@PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "cd_id")
@Transient
var id: Long = 0,
val id: Long = 0,
@ColumnInfo(name = "cd_task", index = true)
@Transient
var task: Long,

@ -1,6 +1,11 @@
package org.tasks.data
import androidx.room.*
import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Update
import com.todoroo.astrid.data.Task
import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
@ -20,7 +25,7 @@ abstract class GoogleTaskDao {
} else {
task.order = getBottom(caldavTask.calendar!!, task.parent)
}
caldavTask.id = insert(caldavTask)
insert(caldavTask)
update(task)
}

Loading…
Cancel
Save