mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Prevent NoClassDefFound error when a WebDAV server returns GetLastModified

Browse source 
which happens in the case of dufs (see last commit)
This commit is contained in:
Torsten Grote 2024-06-14 09:16:42 -03:00
parent 4ac02018fa
commit f15018253c
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/stevesoltys/seedvault/plugins/webdav/WebDavStorage.kt
View file

@ -9,8 +9,12 @@ import android.util.Log
import at.bitfire.dav4jvm.BasicDigestAuthHandler import at.bitfire.dav4jvm.BasicDigestAuthHandler
import at.bitfire.dav4jvm.DavCollection import at.bitfire.dav4jvm.DavCollection
import at.bitfire.dav4jvm.MultiResponseCallback import at.bitfire.dav4jvm.MultiResponseCallback
import at.bitfire.dav4jvm.Property
import at.bitfire.dav4jvm.PropertyFactory
import at.bitfire.dav4jvm.PropertyRegistry
import at.bitfire.dav4jvm.Response import at.bitfire.dav4jvm.Response
import at.bitfire.dav4jvm.Response.HrefRelation.SELF import at.bitfire.dav4jvm.Response.HrefRelation.SELF
import at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV
import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.dav4jvm.exception.HttpException
import at.bitfire.dav4jvm.property.DisplayName import at.bitfire.dav4jvm.property.DisplayName
import at.bitfire.dav4jvm.property.ResourceType import at.bitfire.dav4jvm.property.ResourceType
@ -27,6 +31,7 @@ import okhttp3.OkHttpClient
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.internal.closeQuietly import okhttp3.internal.closeQuietly
import okio.BufferedSink import okio.BufferedSink
import org.xmlpull.v1.XmlPullParser
import java.io.IOException import java.io.IOException
import java.io.InputStream import java.io.InputStream
import java.io.OutputStream import java.io.OutputStream
@ -69,6 +74,10 @@ internal abstract class WebDavStorage(
protected val baseUrl = webDavConfig.url protected val baseUrl = webDavConfig.url
protected val url = "${webDavConfig.url}/$root" protected val url = "${webDavConfig.url}/$root"
init {
PropertyRegistry.register(GetLastModified.Factory)
}
@Throws(IOException::class) @Throws(IOException::class)
protected suspend fun getOutputStream(location: HttpUrl): OutputStream { protected suspend fun getOutputStream(location: HttpUrl): OutputStream {
val davCollection = DavCollection(okHttpClient, location) val davCollection = DavCollection(okHttpClient, location)
@ -237,3 +246,19 @@ internal abstract class WebDavStorage(
} }
} }
/**
* A fake version of [at.bitfire.dav4jvm.property.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 {
companion object {
@JvmField
val NAME = Property.Name(NS_WEBDAV, "getlastmodified")
}
object Factory : PropertyFactory {
override fun getName() = NAME
override fun create(parser: XmlPullParser): GetLastModified? = null
}
}