From 1ed9bcf7c8bf34e03b69630c855f890c0bc67dac Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sat, 31 Jul 2021 00:41:09 +0430 Subject: [PATCH] commit what I've got --- .../xyz/nulldev/androidcompat/androidimpl/CustomContext.java | 3 +-- .../src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java index 617a6f5a..3e51b134 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java @@ -50,10 +50,9 @@ import java.util.Map; /** * Custom context implementation. * - * TODO Deal with packagemanager for extension sources */ public class CustomContext extends Context implements DIAware { - private DI kodein; + private final DI kodein; public CustomContext() { this(KodeinGlobalHelper.kodein()); } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt index 58f8db3c..b4bc4f36 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt @@ -63,14 +63,19 @@ object Source { val props: Any ) + var lastPreferenceScreen: PreferenceScreen? = null + fun getSourcePreferences(sourceId: Long): List { val source = getHttpSource(sourceId) if (source is ConfigurableSource) { val screen = PreferenceScreen(context) + lastPreferenceScreen = screen source.setupPreferenceScreen(screen) + screen.preferences.first().callChangeListener("yo") + return screen.preferences.map { PreferenceObject(it::class.java.name, it) }