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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei 2022-11-15 09:20:44 +08:00
commit 7947f3b391
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/legado/app/App.kt
View File

@ -68,7 +68,7 @@ class App : MultiDexApplication() {
2 -> ChineseUtils.preLoad(true, TransType.SIMPLE_TO_TRADITIONAL)
}
//同步阅读记录
if (AppWebDav.syncBookProgress) {
if (AppConfig.syncBookProgress) {
AppWebDav.downloadAllBookProgress()
}
}

5
app/src/main/java/io/legado/app/help/AppWebDav.kt
View File

@ -39,7 +39,6 @@ object AppWebDav {
private val zipFilePath = "${appCtx.externalFiles.absolutePath}${File.separator}backup.zip"
private val bookProgressUrl get() = "${rootWebDavUrl}bookProgress/"
private val exportsWebDavUrl get() = "${rootWebDavUrl}books/"
val syncBookProgress get() = appCtx.getPrefBoolean(PreferKey.syncBookProgress, true)
var authorization: Authorization? = null
private set
@ -225,7 +224,7 @@ object AppWebDav {
fun uploadBookProgress(book: Book) {
val authorization = authorization ?: return
if (!syncBookProgress) return
if (!AppConfig.syncBookProgress) return
if (!NetworkUtils.isAvailable()) return
Coroutine.async {
val bookProgress = BookProgress(book)
@ -239,7 +238,7 @@ object AppWebDav {
fun uploadBookProgress(bookProgress: BookProgress) {
val authorization = authorization ?: return
if (!syncBookProgress) return
if (!AppConfig.syncBookProgress) return
if (!NetworkUtils.isAvailable()) return
Coroutine.async {
val json = GSON.toJson(bookProgress)

2
app/src/main/java/io/legado/app/help/config/AppConfig.kt
View File

@ -338,6 +338,8 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
appCtx.putPrefInt(PreferKey.preDownloadNum, value)
}
val syncBookProgress get() = appCtx.getPrefBoolean(PreferKey.syncBookProgress, true)
val mediaButtonOnExit get() = appCtx.getPrefBoolean("mediaButtonOnExit", true)
val replaceEnableDefault get() = appCtx.getPrefBoolean(PreferKey.replaceEnableDefault, true)

2
app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
View File

@ -186,7 +186,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
book: Book,
alertSync: ((progress: BookProgress) -> Unit)? = null
) {
if (!AppWebDav.syncBookProgress) return
if (!AppConfig.syncBookProgress) return
execute {
AppWebDav.getBookProgress(book)
?: throw NoStackTraceException("没有进度")

2
app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt
View File

@ -86,7 +86,7 @@ class TocActivity : VMBaseActivity<ActivityChapterListBinding, TocViewModel>() {
return false
}
})
setOnQueryTextFocusChangeListener { v, hasFocus ->
setOnQueryTextFocusChangeListener { _, hasFocus ->
if (!hasFocus) {
searchView?.isIconified = true
}