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

Unverified Commit 084ba3b6 authored by Arnau Mora's avatar Arnau Mora Committed by GitHub
Browse files

Update dav4jvm to new okhttp package (#1786) 



* Upgrade dav4jvm

* Exclude ktor from dav4jvm

* Fix imports and fix usages

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Fix imports for instrumented tests

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Fix imports

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Upgrade dav4jvm

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Do not exclude ktor in dav4jvm

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Upgrade dav4jvm

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

---------

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>
parent 28dcf907

app/src/androidTest/kotlin/at/bitfire/davdroid/db/CollectionTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ package at.bitfire.davdroid.db 


import android.security.NetworkSecurityPolicy

import androidx.test.filters.SmallTest

import at.bitfire.dav4jvm.DavResource

import at.bitfire.dav4jvm.okhttp.DavResource

import at.bitfire.dav4jvm.property.webdav.ResourceType

import at.bitfire.davdroid.network.HttpClientBuilder

import dagger.hilt.android.testing.HiltAndroidRule

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/DavResourceFinderTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
package at.bitfire.davdroid.servicedetection



import android.security.NetworkSecurityPolicy

import at.bitfire.dav4jvm.DavResource

import at.bitfire.dav4jvm.okhttp.DavResource

import at.bitfire.dav4jvm.property.carddav.AddressbookHomeSet

import at.bitfire.dav4jvm.property.webdav.ResourceType

import at.bitfire.davdroid.network.HttpClientBuilder

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/SyncManagerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ import android.accounts.Account 
import android.content.Context

import androidx.core.app.NotificationManagerCompat

import androidx.hilt.work.HiltWorkerFactory

import at.bitfire.dav4jvm.PropStat

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.Response.HrefRelation

import at.bitfire.dav4jvm.okhttp.PropStat

import at.bitfire.dav4jvm.okhttp.Response

import at.bitfire.dav4jvm.okhttp.Response.HrefRelation

import at.bitfire.dav4jvm.property.webdav.GetETag

import at.bitfire.davdroid.TestUtils

import at.bitfire.davdroid.TestUtils.assertWithin

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/TestSyncManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
package at.bitfire.davdroid.sync



import android.accounts.Account

import at.bitfire.dav4jvm.DavCollection

import at.bitfire.dav4jvm.MultiResponseCallback

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.okhttp.DavCollection

import at.bitfire.dav4jvm.okhttp.MultiResponseCallback

import at.bitfire.dav4jvm.okhttp.Response

import at.bitfire.dav4jvm.property.caldav.GetCTag

import at.bitfire.davdroid.db.Collection

import at.bitfire.davdroid.di.SyncDispatcher

app/src/main/kotlin/at/bitfire/davdroid/db/Collection.kt

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ import androidx.room.Entity 
import androidx.room.ForeignKey

import androidx.room.Index

import androidx.room.PrimaryKey

import at.bitfire.dav4jvm.Response

import at.bitfire.dav4jvm.UrlUtils

import at.bitfire.dav4jvm.okhttp.Response

import at.bitfire.dav4jvm.okhttp.UrlUtils

import at.bitfire.dav4jvm.property.caldav.CalendarColor

import at.bitfire.dav4jvm.property.caldav.CalendarDescription

import at.bitfire.dav4jvm.property.caldav.CalendarTimezone