github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make extension list update when languages changes (#7168)

Browse source
This commit is contained in:
Andreas 2022-05-19 14:32:21 +02:00 committed by GitHub
parent 6d154b1e4f
commit 2761d27aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/kanade/domain/extension/interactor/GetExtensions.kt
View file

@ -15,14 +15,14 @@ class GetExtensions(
) { ) {
fun subscribe(): Flow<ExtensionSegregation> { fun subscribe(): Flow<ExtensionSegregation> {
val activeLanguages = preferences.enabledLanguages().get()
val showNsfwSources = preferences.showNsfwSource().get() val showNsfwSources = preferences.showNsfwSource().get()
return combine( return combine(
preferences.enabledLanguages().asFlow(),
extensionManager.getInstalledExtensionsObservable().asFlow(), extensionManager.getInstalledExtensionsObservable().asFlow(),
extensionManager.getUntrustedExtensionsObservable().asFlow(), extensionManager.getUntrustedExtensionsObservable().asFlow(),
extensionManager.getAvailableExtensionsObservable().asFlow(), extensionManager.getAvailableExtensionsObservable().asFlow(),
) { _installed, _untrusted, _available -> ) { _activeLanguages, _installed, _untrusted, _available ->
val installed = _installed val installed = _installed
.filter { it.hasUpdate.not() && (showNsfwSources || it.isNsfw.not()) } .filter { it.hasUpdate.not() && (showNsfwSources || it.isNsfw.not()) }
@ -38,7 +38,7 @@ class GetExtensions(
.filter { extension -> .filter { extension ->
_installed.none { it.pkgName == extension.pkgName } && _installed.none { it.pkgName == extension.pkgName } &&
_untrusted.none { it.pkgName == extension.pkgName } && _untrusted.none { it.pkgName == extension.pkgName } &&
extension.lang in activeLanguages && extension.lang in _activeLanguages &&
(showNsfwSources || extension.isNsfw.not()) (showNsfwSources || extension.isNsfw.not())
} }