Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Possibly fix extension obsolete bug

Browse Source
This commit is contained in:
Jobobby04 2024-05-05 13:17:29 -04:00
parent c3fb5c0bec
commit 46bf139f01
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,10 +54,8 @@ class ExtensionManager(
val scope = CoroutineScope(SupervisorJob()) val scope = CoroutineScope(SupervisorJob())
// SY -->
private val _isInitialized = MutableStateFlow(false) private val _isInitialized = MutableStateFlow(false)
val isInitialized: StateFlow<Boolean> = _isInitialized.asStateFlow() val isInitialized: StateFlow<Boolean> = _isInitialized.asStateFlow()
// SY <--
/** /**
* API where all the available extensions can be found. * API where all the available extensions can be found.
@ -75,7 +73,10 @@ class ExtensionManager(
val installedExtensionsFlow = _installedExtensionsMapFlow.mapExtensions(scope) val installedExtensionsFlow = _installedExtensionsMapFlow.mapExtensions(scope)
private val _availableExtensionsMapFlow = MutableStateFlow(emptyMap<String, Extension.Available>()) private val _availableExtensionsMapFlow = MutableStateFlow(emptyMap<String, Extension.Available>())
val availableExtensionsFlow = _availableExtensionsMapFlow.mapExtensions(scope) // SY -->
val availableExtensionsFlow = _availableExtensionsMapFlow.map { it.filterNotBlacklisted().values.toList() }
.stateIn(scope, SharingStarted.Lazily, _availableExtensionsMapFlow.value.values.toList())
// SY <--
private val _untrustedExtensionsMapFlow = MutableStateFlow(emptyMap<String, Extension.Untrusted>()) private val _untrustedExtensionsMapFlow = MutableStateFlow(emptyMap<String, Extension.Untrusted>())
val untrustedExtensionsFlow = _untrustedExtensionsMapFlow.mapExtensions(scope) val untrustedExtensionsFlow = _untrustedExtensionsMapFlow.mapExtensions(scope)
@ -136,9 +137,9 @@ class ExtensionManager(
.associate { it.extension.pkgName to it.extension } .associate { it.extension.pkgName to it.extension }
// SY --> // SY -->
.filterNotBlacklisted() .filterNotBlacklisted()
// SY <--
_isInitialized.value = true _isInitialized.value = true
// SY <--
} }
// EXH --> // EXH -->
@ -220,9 +221,7 @@ class ExtensionManager(
val installedExtensionsMap = _installedExtensionsMapFlow.value.toMutableMap() val installedExtensionsMap = _installedExtensionsMapFlow.value.toMutableMap()
var changed = false var changed = false
for ((pkgName, extension) in installedExtensionsMap) { for ((pkgName, extension) in installedExtensionsMap) {
// SY --> val availableExt = availableExtensions.find { it.pkgName == pkgName }
val availableExt = availableExtensionsFlow.value.find { it.pkgName == pkgName }
// SY <--
if (availableExt == null && !extension.isObsolete) { if (availableExt == null && !extension.isObsolete) {
installedExtensionsMap[pkgName] = extension.copy(isObsolete = true) installedExtensionsMap[pkgName] = extension.copy(isObsolete = true)