Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-19 04:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

DownloadController: Fix first active download status not updating (#8069)

Browse Source
This commit is contained in:
Ivan Iskandar 2022-09-24 22:59:11 +07:00 committed by GitHub
parent b8c1257645
commit f98b4f4e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt
View File

@ -75,7 +75,9 @@ class DownloadQueue(
Observable.from(this).filter { download -> download.status == Download.State.DOWNLOADING } Observable.from(this).filter { download -> download.status == Download.State.DOWNLOADING }
@Deprecated("Use getStatusAsFlow instead") @Deprecated("Use getStatusAsFlow instead")
fun getStatusObservable(): Observable<Download> = statusSubject.onBackpressureBuffer() fun getStatusObservable(): Observable<Download> = statusSubject
.startWith(getActiveDownloads())
.onBackpressureBuffer()
fun getStatusAsFlow(): Flow<Download> = getStatusObservable().asFlow() fun getStatusAsFlow(): Flow<Download> = getStatusObservable().asFlow()

22
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
View File

@ -90,19 +90,6 @@ class DownloadController :
override fun createPresenter() = DownloadPresenter() override fun createPresenter() = DownloadPresenter()
override fun onViewCreated(view: View) {
super.onViewCreated(view)
viewScope.launchUI {
presenter.getDownloadStatusFlow()
.collect(this@DownloadController::onStatusChange)
}
viewScope.launchUI {
presenter.getDownloadProgressFlow()
.collect(this@DownloadController::onUpdateDownloadedPages)
}
}
@Composable @Composable
override fun ComposeContent() { override fun ComposeContent() {
val context = LocalContext.current val context = LocalContext.current
@ -291,6 +278,15 @@ class DownloadController :
ViewCompat.setNestedScrollingEnabled(controllerBinding.root, true) ViewCompat.setNestedScrollingEnabled(controllerBinding.root, true)
viewScope.launchUI {
presenter.getDownloadStatusFlow()
.collect(this@DownloadController::onStatusChange)
}
viewScope.launchUI {
presenter.getDownloadProgressFlow()
.collect(this@DownloadController::onUpdateDownloadedPages)
}
controllerBinding.root controllerBinding.root
}, },
update = { update = {