mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-10 11:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use flows instead of relays for extensions loading

Browse Source
This commit is contained in:
arkon
2021-01-04 11:09:31 -05:00
parent a4cab9876a
commit 07e76f35fa
3 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt
View File

@@ -8,13 +8,17 @@ import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.extension.model.Extension
import eu.kanade.tachiyomi.extension.model.InstallStep
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.system.LocaleHelper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.debounce
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.withContext
import rx.Observable
import rx.Subscription
import rx.android.schedulers.AndroidSchedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.concurrent.TimeUnit
private typealias ExtensionTuple =
Triple<List<Extension.Installed>, List<Extension.Untrusted>, List<Extension.Available>>
@@ -35,20 +39,23 @@ open class ExtensionPresenter(
super.onCreate(savedState)
extensionManager.findAvailableExtensions()
bindToExtensionsObservable()
}
private fun bindToExtensionsObservable(): Subscription {
val installedObservable = extensionManager.getInstalledExtensionsObservable()
val untrustedObservable = extensionManager.getUntrustedExtensionsObservable()
val availableObservable = extensionManager.getAvailableExtensionsObservable()
.startWith(emptyList<Extension.Available>())
launchIO {
val installedFlow = extensionManager.installedExtensionsFlow
val untrustedFlow = extensionManager.untrustedExtensionsFlow
val availableFlow = extensionManager.availableExtensionsFlow
return Observable.combineLatest(installedObservable, untrustedObservable, availableObservable) { installed, untrusted, available -> Triple(installed, untrusted, available) }
.debounce(100, TimeUnit.MILLISECONDS)
.map(::toItems)
.observeOn(AndroidSchedulers.mainThread())
.subscribeLatestCache({ view, _ -> view.setExtensions(extensions) })
combine(
installedFlow,
untrustedFlow,
availableFlow
) { installed, untrusted, available ->
Triple(installed, untrusted, available)
}
.debounce(100)
.map(::toItems)
.collectLatest { withContext(Dispatchers.Main) { view?.setExtensions(extensions) } }
}
}
@Synchronized

29
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt
View File

@@ -3,7 +3,13 @@ package eu.kanade.tachiyomi.ui.browse.extension.details
import android.os.Bundle
import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import rx.android.schedulers.AndroidSchedulers
import eu.kanade.tachiyomi.util.lang.launchIO
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.drop
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.take
import kotlinx.coroutines.withContext
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -17,19 +23,14 @@ class ExtensionDetailsPresenter(
override fun onCreate(savedState: Bundle?) {
super.onCreate(savedState)
bindToUninstalledExtension()
}
private fun bindToUninstalledExtension() {
extensionManager.getInstalledExtensionsObservable()
.skip(1)
.filter { extensions -> extensions.none { it.pkgName == pkgName } }
.map { }
.take(1)
.observeOn(AndroidSchedulers.mainThread())
.subscribeFirst({ view, _ ->
view.onExtensionUninstalled()
})
// Watch for uninstalled event
launchIO {
extensionManager.installedExtensionsFlow
.drop(1)
.filter { extensions -> extensions.none { it.pkgName == pkgName } }
.take(1)
.collect { withContext(Dispatchers.Main) { view?.onExtensionUninstalled() } }
}
}
fun uninstallExtension() {