Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 796eddb9 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update dav4jvm, Kotlin

parent 57a77bd5

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ dependencies { 
    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

    implementation 'androidx.core:core-ktx:1.9.0'

    implementation 'androidx.fragment:fragment-ktx:1.5.3'

    implementation 'androidx.fragment:fragment-ktx:1.5.4'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'

    implementation 'androidx.paging:paging-runtime-ktx:3.1.1'

app/src/androidTestOse/java/at/bitfire/davdroid/syncadapter/TestSyncManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import android.content.Context 
import android.content.SyncResult

import android.os.Bundle

import at.bitfire.dav4jvm.DavCollection

import at.bitfire.dav4jvm.DavResponseCallback

import at.bitfire.dav4jvm.MultiResponseCallback

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.property.GetCTag

import at.bitfire.davdroid.DavUtils
@@ -67,12 +67,12 @@ class TestSyncManager( 


    var listAllRemoteResult = emptyList<Pair<Response, Response.HrefRelation>>()

    var didListAllRemote = false

    override fun listAllRemote(callback: DavResponseCallback) {

    override fun listAllRemote(callback: MultiResponseCallback) {

        if (didListAllRemote)

            throw IllegalStateException("listAllRemote() must not be called twice")

        didListAllRemote = true

        for (result in listAllRemoteResult)

            callback(result.first, result.second)

            callback.onResponse(result.first, result.second)

    }



    var assertDownloadRemote = emptyMap<HttpUrl, String>()

app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import android.content.Context 
import android.content.SyncResult

import android.os.Bundle

import at.bitfire.dav4jvm.DavCalendar

import at.bitfire.dav4jvm.DavResponseCallback

import at.bitfire.dav4jvm.MultiResponseCallback

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.exception.DavException

import at.bitfire.dav4jvm.property.*
@@ -101,7 +101,7 @@ class CalendarSyncManager( 
        os.toByteArray().toRequestBody(DavCalendar.MIME_ICALENDAR_UTF8)

    }



    override fun listAllRemote(callback: DavResponseCallback) {

    override fun listAllRemote(callback: MultiResponseCallback) {

        // calculate time range limits

        var limitStart: Date? = null

        accountSettings.getTimeRangePastDays()?.let { pastDays ->

app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ import android.content.SyncResult 
import android.os.Build

import android.os.Bundle

import at.bitfire.dav4jvm.DavAddressBook

import at.bitfire.dav4jvm.DavResponseCallback

import at.bitfire.dav4jvm.MultiResponseCallback

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.exception.DavException

import at.bitfire.dav4jvm.property.*
@@ -252,7 +252,7 @@ class ContactsSyncManager( 
            return@localExceptionContext(os.toByteArray().toRequestBody(mimeType))

        }



    override fun listAllRemote(callback: DavResponseCallback) =

    override fun listAllRemote(callback: MultiResponseCallback) =

            remoteExceptionContext {

                it.propfind(1, ResourceType.NAME, GetETag.NAME, callback = callback)

            }

app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import android.content.Context 
import android.content.SyncResult

import android.os.Bundle

import at.bitfire.dav4jvm.DavCalendar

import at.bitfire.dav4jvm.DavResponseCallback

import at.bitfire.dav4jvm.MultiResponseCallback

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.exception.DavException

import at.bitfire.dav4jvm.property.*
@@ -76,7 +76,7 @@ class JtxSyncManager( 


    override fun syncAlgorithm() = SyncAlgorithm.PROPFIND_REPORT



    override fun listAllRemote(callback: DavResponseCallback) {

    override fun listAllRemote(callback: MultiResponseCallback) {

        remoteExceptionContext { remote ->

            if (localCollection.supportsVTODO) {

                Logger.log.info("Querying tasks")