mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-10-01 17:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use generic for update

Browse source
This commit is contained in:
Sunik Kupfer 2024-07-31 11:43:48 +02:00
parent 7ae1425039
commit 42dd665851
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/at/bitfire/davdroid/sync/AddressBookSyncer.kt
View file

@ -61,14 +61,14 @@ class AddressBookSyncer @AssistedInject constructor(
collectionRepository.getByServiceAndSync(serviceId)
override fun LocalAddressBook.deleteCollection() {
logger.log(Level.INFO, "Deleting obsolete local address book", url)
logger.log(Level.INFO, "Deleting obsolete local address book", collectionUrl)
delete()
}
override fun update(localCollection: LocalAddressBook, remoteCollection: Collection) {
override fun LocalAddressBook.updateCollection(remoteCollection: Collection) {
try {
logger.log(Level.FINE, "Updating local address book ${remoteCollection.url}", remoteCollection)
localCollection.update(remoteCollection, forceAllReadOnly)
logger.log(Level.FINE, "Updating local address book $collectionUrl", remoteCollection)
update(remoteCollection, forceAllReadOnly)
} catch (e: Exception) {
logger.log(Level.WARNING, "Couldn't rename address book account", e)
}

6
app/src/main/kotlin/at/bitfire/davdroid/sync/CalendarSyncer.kt
View file

@ -80,9 +80,9 @@ class CalendarSyncer @AssistedInject constructor(
syncManager.performSync()
}
override fun update(localCollection: LocalCalendar, remoteCollection: Collection) {
logger.log(Level.FINE, "Updating local calendar ${remoteCollection.url}", remoteCollection)
localCollection.update(remoteCollection, accountSettings.getManageCalendarColors())
override fun LocalCalendar.updateCollection(remoteCollection: Collection) {
logger.log(Level.FINE, "Updating local calendar $collectionUrl", remoteCollection)
update(remoteCollection, accountSettings.getManageCalendarColors())
}
override fun create(provider: ContentProviderClient, remoteCollection: Collection) {

8
app/src/main/kotlin/at/bitfire/davdroid/sync/JtxSyncer.kt
View file

@ -77,14 +77,14 @@ class JtxSyncer @AssistedInject constructor(
collectionRepository.getSyncJtxCollections(serviceId)
override fun LocalJtxCollection.deleteCollection() {
logger.log(Level.INFO, "Deleting obsolete local jtx collection", url)
logger.log(Level.INFO, "Deleting obsolete local jtx collection", collectionUrl)
delete()
}
override fun update(localCollection: LocalJtxCollection, remoteCollection: Collection) {
logger.log(Level.FINE, "Updating local jtx collection ${remoteCollection.url}", remoteCollection)
override fun LocalJtxCollection.updateCollection(remoteCollection: Collection) {
logger.log(Level.FINE, "Updating local jtx collection $collectionUrl", remoteCollection)
val owner = remoteCollection.ownerId?.let { principalRepository.get(it) }
localCollection.updateCollection(remoteCollection, owner, accountSettings.getManageCalendarColors())
updateCollection(remoteCollection, owner, accountSettings.getManageCalendarColors())
}
override fun create(provider: ContentProviderClient, remoteCollection: Collection) {

4
app/src/main/kotlin/at/bitfire/davdroid/sync/Syncer.kt
View file

@ -110,7 +110,7 @@ abstract class Syncer<CollectionType: LocalCollection<*>>(
localCollection.deleteCollection()
else {
// Collection exists locally, update local resource and don't add it again
update(localCollection, remoteCollection)
localCollection.updateCollection(remoteCollection)
newRemoteCollections -= remoteCollection.url
}
}
@ -145,7 +145,7 @@ abstract class Syncer<CollectionType: LocalCollection<*>>(
abstract fun CollectionType.deleteCollection()
abstract fun update(localCollection: CollectionType, remoteCollection: Collection)
abstract fun CollectionType.updateCollection(remoteCollection: Collection)
abstract fun create(provider: ContentProviderClient, remoteCollection: Collection)

8
app/src/main/kotlin/at/bitfire/davdroid/sync/TaskSyncer.kt
View file

@ -79,13 +79,13 @@ class TaskSyncer @AssistedInject constructor(
collectionRepository.getSyncTaskLists(serviceId)
override fun LocalTaskList.deleteCollection() {
logger.log(Level.INFO, "Deleting obsolete local task list", syncId)
logger.log(Level.INFO, "Deleting obsolete local task list", collectionUrl)
delete()
}
override fun update(localCollection: LocalTaskList, remoteCollection: Collection) {
logger.log(Level.FINE, "Updating local task list ${remoteCollection.url}", remoteCollection)
localCollection.update(remoteCollection, accountSettings.getManageCalendarColors())
override fun LocalTaskList.updateCollection(remoteCollection: Collection) {
logger.log(Level.FINE, "Updating local task list $collectionUrl", remoteCollection)
update(remoteCollection, accountSettings.getManageCalendarColors())
}
override fun create(provider: ContentProviderClient, remoteCollection: Collection) {