gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-08-30 09:23:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #2870

Browse Source
This commit is contained in:
Xwite 2023-03-13 12:17:24 +08:00
parent a6165550fb
commit e5f1878cda
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/io/legado/app/lib/webdav/Authorization.kt
View File

@ -2,7 +2,6 @@ package io.legado.app.lib.webdav
import io.legado.app.data.appDb
import io.legado.app.data.entities.Server.WebDavConfig
import io.legado.app.exception.NoStackTraceException
import okhttp3.Credentials
import java.nio.charset.Charset
import java.nio.charset.StandardCharsets
@ -24,7 +23,7 @@ data class Authorization(
}
constructor(serverID: Long?): this("","") {
serverID ?: throw NoStackTraceException("Unexpected server ID")
serverID ?: throw WebDavException("Unexpected server ID")
appDb.serverDao.get(serverID)?.getWebDavConfig()?.run {
data = Credentials.basic(username, password, charset)
} ?: throw WebDavException("Unexpected WebDav Authorization")

4
app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
View File

@ -329,10 +329,10 @@ object LocalBook {
// 兼容旧版链接
val webdav: WebDav = kotlin.runCatching {
WebDav.fromPath(webDavUrl)
}.onFailure {
}.getOrElse {
AppWebDav.defaultBookWebDav
?: throw WebDavException("Unexpected defaultBookWebDav")
}.getOrThrow()
}
val uri = runBlocking {
saveBookFile(webdav.downloadInputStream(), localBook.originName)
}