mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 11:11:02 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Reflect ical4android tasks API changes

Browse source
This commit is contained in:
Ricki Hirner 2024-02-22 12:16:10 +01:00
parent 774fced9e8
commit 6b1367d6dc
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/kotlin/at/bitfire/davdroid/resource/LocalTask.kt
View file

@ -5,16 +5,16 @@
package at.bitfire.davdroid.resource
import android.content.ContentValues
import at.bitfire.ical4android.AndroidTask
import at.bitfire.ical4android.AndroidTaskFactory
import at.bitfire.ical4android.AndroidTaskList
import at.bitfire.ical4android.DmfsTask
import at.bitfire.ical4android.DmfsTaskFactory
import at.bitfire.ical4android.DmfsTaskList
import at.bitfire.ical4android.BatchOperation
import at.bitfire.ical4android.Ical4Android
import at.bitfire.ical4android.Task
import org.dmfs.tasks.contract.TaskContract.Tasks
import java.util.UUID
class LocalTask: AndroidTask, LocalResource<Task> {
class LocalTask: DmfsTask, LocalResource<Task> {
companion object {
const val COLUMN_ETAG = Tasks.SYNC1
@ -30,14 +30,14 @@ class LocalTask: AndroidTask, LocalResource<Task> {
private set
constructor(taskList: AndroidTaskList<*>, task: Task, fileName: String?, eTag: String?, flags: Int)
constructor(taskList: DmfsTaskList<*>, task: Task, fileName: String?, eTag: String?, flags: Int)
: super(taskList, task) {
this.fileName = fileName
this.eTag = eTag
this.flags = flags
}
private constructor(taskList: AndroidTaskList<*>, values: ContentValues): super(taskList) {
private constructor(taskList: DmfsTaskList<*>, values: ContentValues): super(taskList) {
id = values.getAsLong(Tasks._ID)
fileName = values.getAsString(Tasks._SYNC_ID)
eTag = values.getAsString(COLUMN_ETAG)
@ -105,8 +105,8 @@ class LocalTask: AndroidTask, LocalResource<Task> {
}
object Factory: AndroidTaskFactory<LocalTask> {
override fun fromProvider(taskList: AndroidTaskList<*>, values: ContentValues) =
object Factory: DmfsTaskFactory<LocalTask> {
override fun fromProvider(taskList: DmfsTaskList<*>, values: ContentValues) =
LocalTask(taskList, values)
}
}

8
app/src/main/kotlin/at/bitfire/davdroid/resource/LocalTaskList.kt
View file

@ -14,8 +14,8 @@ import at.bitfire.davdroid.db.Collection
import at.bitfire.davdroid.db.SyncState
import at.bitfire.davdroid.log.Logger
import at.bitfire.davdroid.util.DavUtils
import at.bitfire.ical4android.AndroidTaskList
import at.bitfire.ical4android.AndroidTaskListFactory
import at.bitfire.ical4android.DmfsTaskList
import at.bitfire.ical4android.DmfsTaskListFactory
import at.bitfire.ical4android.TaskProvider
import org.dmfs.tasks.contract.TaskContract.*
import java.util.logging.Level
@ -24,7 +24,7 @@ class LocalTaskList private constructor(
account: Account,
provider: TaskProvider,
id: Long
): AndroidTaskList<LocalTask>(account, provider, LocalTask.Factory, id), LocalCollection<LocalTask> {
): DmfsTaskList<LocalTask>(account, provider, LocalTask.Factory, id), LocalCollection<LocalTask> {
companion object {
@ -144,7 +144,7 @@ class LocalTaskList private constructor(
}
object Factory: AndroidTaskListFactory<LocalTaskList> {
object Factory: DmfsTaskListFactory<LocalTaskList> {
override fun newInstance(account: Account, provider: TaskProvider, id: Long) =
LocalTaskList(account, provider, id)

6
app/src/main/kotlin/at/bitfire/davdroid/syncadapter/TaskSyncer.kt
View file

@ -16,7 +16,7 @@ import at.bitfire.davdroid.log.Logger
import at.bitfire.davdroid.network.HttpClient
import at.bitfire.davdroid.resource.LocalTaskList
import at.bitfire.davdroid.settings.AccountSettings
import at.bitfire.ical4android.AndroidTaskList
import at.bitfire.ical4android.DmfsTaskList
import at.bitfire.ical4android.TaskProvider
import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrl
@ -54,7 +54,7 @@ class TaskSyncer(context: Context): Syncer(context) {
updateLocalTaskLists(taskProvider, account, accountSettings)
val taskLists = AndroidTaskList
val taskLists = DmfsTaskList
.find(account, taskProvider, LocalTaskList.Factory, "${TaskContract.TaskLists.SYNC_ENABLED}!=0", null)
for (taskList in taskLists) {
Logger.log.info("Synchronizing task list #${taskList.id} [${taskList.syncId}]")
@ -83,7 +83,7 @@ class TaskSyncer(context: Context): Syncer(context) {
// delete/update local task lists
val updateColors = settings.getManageCalendarColors()
for (list in AndroidTaskList.find(account, provider, LocalTaskList.Factory, null, null))
for (list in DmfsTaskList.find(account, provider, LocalTaskList.Factory, null, null))
list.syncId?.let {
val url = it.toHttpUrl()
val info = remoteTaskLists[url]