pull/34/head
kunfei 5 years ago
parent a7325b1e12
commit 71c95a37fb
  1. 14
      app/src/main/java/io/legado/app/lib/webdav/WebDav.kt

@ -20,9 +20,9 @@ import java.net.URLEncoder
import java.util.* import java.util.*
class WebDav @Throws(MalformedURLException::class) class WebDav @Throws(MalformedURLException::class)
constructor(url: String) { constructor(urlStr: String) {
private val okHttpClient = HttpHelper.client private val okHttpClient = HttpHelper.client
private val url: URL = URL(null, url, Handler) private val url: URL = URL(null, urlStr, Handler)
private var httpUrl: String? = null private var httpUrl: String? = null
var displayName: String? = null var displayName: String? = null
@ -32,9 +32,10 @@ constructor(url: String) {
var urlName = "" var urlName = ""
get() { get() {
if (field.isEmpty()) { if (field.isEmpty()) {
this.urlName = (if (parent.isEmpty()) url.file else url.toString() this.urlName = (
.replace(parent, "")) if (parent.isEmpty()) url.file
.replace("/", "") else url.toString().replace(parent, "")
).replace("/", "")
} }
return field return field
} }
@ -140,9 +141,7 @@ constructor(url: String) {
Credentials.basic(it.user, it.pass) Credentials.basic(it.user, it.pass)
) )
} }
request.header("Depth", if (depth < 0) "infinity" else depth.toString()) request.header("Depth", if (depth < 0) "infinity" else depth.toString())
return okHttpClient.newCall(request.build()).execute() return okHttpClient.newCall(request.build()).execute()
} }
return null return null
@ -238,7 +237,6 @@ constructor(url: String) {
Credentials.basic(it.user, it.pass) Credentials.basic(it.user, it.pass)
) )
} }
val response = okHttpClient.newCall(requestBuilder.build()).execute() val response = okHttpClient.newCall(requestBuilder.build()).execute()
return response.isSuccessful return response.isSuccessful
} }

Loading…
Cancel
Save