diff --git a/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStorage.kt b/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStorage.kt index 12893a3d..b56bf32c 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStorage.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStorage.kt @@ -14,10 +14,10 @@ import at.bitfire.dav4jvm.PropertyFactory import at.bitfire.dav4jvm.PropertyRegistry import at.bitfire.dav4jvm.Response import at.bitfire.dav4jvm.Response.HrefRelation.SELF -import at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV import at.bitfire.dav4jvm.exception.HttpException -import at.bitfire.dav4jvm.property.DisplayName -import at.bitfire.dav4jvm.property.ResourceType +import at.bitfire.dav4jvm.property.webdav.DisplayName +import at.bitfire.dav4jvm.property.webdav.NS_WEBDAV +import at.bitfire.dav4jvm.property.webdav.ResourceType import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -248,7 +248,7 @@ internal abstract class WebDavStorage( } /** - * A fake version of [at.bitfire.dav4jvm.property.GetLastModified] which we register + * A fake version of [at.bitfire.dav4jvm.property.webdav.GetLastModified] which we register * so we don't need to depend on `org.apache.commons.lang3` which is used for date parsing. */ class GetLastModified : Property { diff --git a/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStoragePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStoragePlugin.kt index 952a42cd..dc7e7289 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStoragePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStoragePlugin.kt @@ -11,9 +11,9 @@ import at.bitfire.dav4jvm.DavCollection import at.bitfire.dav4jvm.Response.HrefRelation.SELF import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.dav4jvm.exception.NotFoundException -import at.bitfire.dav4jvm.property.DisplayName -import at.bitfire.dav4jvm.property.QuotaAvailableBytes -import at.bitfire.dav4jvm.property.ResourceType +import at.bitfire.dav4jvm.property.webdav.DisplayName +import at.bitfire.dav4jvm.property.webdav.QuotaAvailableBytes +import at.bitfire.dav4jvm.property.webdav.ResourceType import com.stevesoltys.seedvault.plugins.EncryptedMetadata import com.stevesoltys.seedvault.plugins.StoragePlugin import com.stevesoltys.seedvault.plugins.chunkFolderRegex diff --git a/app/src/main/java/com/stevesoltys/seedvault/storage/WebDavStoragePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/storage/WebDavStoragePlugin.kt index f8592af6..28241dee 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/storage/WebDavStoragePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/storage/WebDavStoragePlugin.kt @@ -9,8 +9,8 @@ import android.util.Log import at.bitfire.dav4jvm.DavCollection import at.bitfire.dav4jvm.Response.HrefRelation.SELF import at.bitfire.dav4jvm.exception.NotFoundException -import at.bitfire.dav4jvm.property.DisplayName -import at.bitfire.dav4jvm.property.ResourceType +import at.bitfire.dav4jvm.property.webdav.DisplayName +import at.bitfire.dav4jvm.property.webdav.ResourceType import com.stevesoltys.seedvault.crypto.KeyManager import com.stevesoltys.seedvault.plugins.chunkFolderRegex import com.stevesoltys.seedvault.plugins.webdav.DIRECTORY_ROOT diff --git a/libs/dav4jvm/Android.bp b/libs/dav4jvm/Android.bp index ae808e62..66092662 100644 --- a/libs/dav4jvm/Android.bp +++ b/libs/dav4jvm/Android.bp @@ -5,7 +5,7 @@ java_import { name: "seedvault-lib-dav4jvm", - jars: ["dav4jvm-2.2.1.jar"], + jars: ["dav4jvm-b8be778.jar"], sdk_version: "current", } diff --git a/libs/dav4jvm/dav4jvm-2.2.1.jar b/libs/dav4jvm/dav4jvm-2.2.1.jar deleted file mode 100644 index 582827d4..00000000 Binary files a/libs/dav4jvm/dav4jvm-2.2.1.jar and /dev/null differ diff --git a/libs/dav4jvm/dav4jvm-b8be778.jar b/libs/dav4jvm/dav4jvm-b8be778.jar new file mode 100644 index 00000000..5d5d633b Binary files /dev/null and b/libs/dav4jvm/dav4jvm-b8be778.jar differ