From 1d593de65440ddb531ee0421d17c6033a52dd5bb Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Tue, 26 Jul 2022 16:30:51 -0400 Subject: [PATCH] Minor improvements for delegated source id lists --- .../kanade/tachiyomi/source/SourceManager.kt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 365901515..e35964db3 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -307,7 +307,7 @@ class SourceManager( ), ).associateBy { it.originalSourceQualifiedClassName } - val currentDelegatedSources = ListenMutableMap(mutableMapOf(), ::handleSourceLibrary) + val currentDelegatedSources: MutableMap = ListenMutableMap(mutableMapOf(), ::handleSourceLibrary) data class DelegatedSource( val sourceName: String, @@ -318,19 +318,10 @@ class SourceManager( ) } - class ListenMutableMap(private val internalMap: MutableMap, val listener: () -> Unit) : MutableMap { - override val size: Int - get() = internalMap.size - override fun containsKey(key: K): Boolean = internalMap.containsKey(key) - override fun containsValue(value: V): Boolean = internalMap.containsValue(value) - override fun get(key: K): V? = internalMap[key] - override fun isEmpty(): Boolean = internalMap.isEmpty() - override val entries: MutableSet> - get() = internalMap.entries - override val keys: MutableSet - get() = internalMap.keys - override val values: MutableCollection - get() = internalMap.values + private class ListenMutableMap( + private val internalMap: MutableMap, + private val listener: () -> Unit, + ) : MutableMap by internalMap { override fun clear() { val clearResult = internalMap.clear() listener()