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

Revert "Use flows instead of relays for extensions loading"

Browse Source 
This reverts commit 07e76f35fa.
This commit is contained in:
arkon
2021-01-07 18:34:38 -05:00
parent 9db81a5a49
commit c620c924f9
3 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
View File

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.extension
import android.content.Context
import android.graphics.drawable.Drawable
import com.jakewharton.rxrelay.BehaviorRelay
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.plusAssign
import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
@@ -13,11 +14,9 @@ import eu.kanade.tachiyomi.extension.util.ExtensionInstaller
import eu.kanade.tachiyomi.extension.util.ExtensionLoader
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.launchNow
import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.async
import kotlinx.coroutines.flow.MutableStateFlow
import rx.Observable
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -50,7 +49,7 @@ class ExtensionManager(
/**
* Relay used to notify the installed extensions.
*/
val installedExtensionsFlow = MutableStateFlow<List<Extension.Installed>>(emptyList())
private val installedExtensionsRelay = BehaviorRelay.create<List<Extension.Installed>>()
private val iconMap = mutableMapOf<String, Drawable>()
@@ -60,7 +59,7 @@ class ExtensionManager(
var installedExtensions = emptyList<Extension.Installed>()
private set(value) {
field = value
launchIO { installedExtensionsFlow.emit(value) }
installedExtensionsRelay.call(value)
}
fun getAppIconForSource(source: Source): Drawable? {
@@ -74,7 +73,7 @@ class ExtensionManager(
/**
* Relay used to notify the available extensions.
*/
val availableExtensionsFlow = MutableStateFlow<List<Extension.Available>>(emptyList())
private val availableExtensionsRelay = BehaviorRelay.create<List<Extension.Available>>()
/**
* List of the currently available extensions.
@@ -82,14 +81,14 @@ class ExtensionManager(
var availableExtensions = emptyList<Extension.Available>()
private set(value) {
field = value
launchIO { availableExtensionsFlow.emit(value) }
availableExtensionsRelay.call(value)
updatedInstalledExtensionsStatuses(value)
}
/**
* Relay used to notify the untrusted extensions.
*/
val untrustedExtensionsFlow = MutableStateFlow<List<Extension.Untrusted>>(emptyList())
private val untrustedExtensionsRelay = BehaviorRelay.create<List<Extension.Untrusted>>()
/**
* List of the currently untrusted extensions.
@@ -97,7 +96,7 @@ class ExtensionManager(
var untrustedExtensions = emptyList<Extension.Untrusted>()
private set(value) {
field = value
launchIO { untrustedExtensionsFlow.emit(value) }
untrustedExtensionsRelay.call(value)
}
/**
@@ -132,6 +131,27 @@ class ExtensionManager(
.map { it.extension }
}
/**
* Returns the relay of the installed extensions as an observable.
*/
fun getInstalledExtensionsObservable(): Observable<List<Extension.Installed>> {
return installedExtensionsRelay.asObservable()
}
/**
* Returns the relay of the available extensions as an observable.
*/
fun getAvailableExtensionsObservable(): Observable<List<Extension.Available>> {
return availableExtensionsRelay.asObservable()
}
/**
* Returns the relay of the untrusted extensions as an observable.
*/
fun getUntrustedExtensionsObservable(): Observable<List<Extension.Untrusted>> {
return untrustedExtensionsRelay.asObservable()
}
/**
* Finds the available extensions in the [api] and updates [availableExtensions].
*/