YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2023-11-20 20:10:18 +08:00
parent 1c12b1d5b8
commit e214c2a8fd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt
+5 -2
View File
@@ -200,7 +200,7 @@ open class ChangeBookSourceViewModel(application: Application) : BaseViewModel(a
} }
++searchIndex ++searchIndex
} }
val source = bookSourceList[searchIndex] val source = bookSourceList.getOrNull(searchIndex) ?: return
bookSourceList[searchIndex] = emptyBookSource bookSourceList[searchIndex] = emptyBookSource
val task = execute( val task = execute(
context = searchPool!!, context = searchPool!!,
@@ -227,9 +227,11 @@ open class ChangeBookSourceViewModel(application: Application) : BaseViewModel(a
} }
}.timeout(60000L) }.timeout(60000L)
.onError { .onError {
ensureActive()
nextSearch() nextSearch()
} }
.onSuccess { .onSuccess {
ensureActive()
nextSearch() nextSearch()
} }
task.start() task.start()
@@ -298,8 +300,9 @@ open class ChangeBookSourceViewModel(application: Application) : BaseViewModel(a
searchCallback?.searchSuccess(searchBook) searchCallback?.searchSuccess(searchBook)
} }
@Synchronized
private fun nextSearch() { private fun nextSearch() {
synchronized(this) { kotlin.runCatching {
if (searchIndex < bookSourceList.lastIndex) { if (searchIndex < bookSourceList.lastIndex) {
search() search()
} else { } else {