From 0f9f7ffc28f6d27249b163dac24e748cd8c404eb Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 14 Sep 2020 14:36:56 -0400
Subject: [PATCH] Cleanup
---
.../kanade/tachiyomi/ui/setting/SettingsMainController.kt | 2 +-
.../tachiyomi/ui/setting/SettingsMangaDexController.kt | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
index 1f8aa624c..646a82049 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
@@ -81,7 +81,7 @@ class SettingsMainController : SettingsController() {
onClick { navigateTo(SettingsEhController()) }
}
}
- if (MdUtil.getEnabledMangaDex(preferences) != null) {
+ if (MdUtil.getEnabledMangaDexs(preferences).isNotEmpty()) {
preference {
iconRes = R.drawable.ic_tracker_mangadex_logo
iconTint = tintColor
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt
index ba816a79a..c0bdfb00c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt
@@ -22,7 +22,7 @@ class SettingsMangaDexController :
MangadexLoginDialog.Listener,
MangadexLogoutDialog.Listener {
- private val mdex by lazy { MdUtil.getEnabledMangaDex() }
+ private val mdex by lazy { MdUtil.getEnabledMangaDex(preferences) }
override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
titleRes = R.string.mangadex_specific_settings
@@ -49,13 +49,9 @@ class SettingsMangaDexController :
titleRes = R.string.mangadex_preffered_source
summaryRes = R.string.mangadex_preffered_source_summary
key = PreferenceKeys.preferredMangaDexId
- val mangaDexs = MdUtil.getEnabledMangaDexs()
+ val mangaDexs = MdUtil.getEnabledMangaDexs(preferences)
entries = mangaDexs.map { it.toString() }.toTypedArray()
entryValues = mangaDexs.map { it.id.toString() }.toTypedArray()
- /*setOnPreferenceChangeListener { preference, newValue ->
- preferences.preferredMangaDexId().set((newValue as? String)?.toLongOrNull() ?: 0)
- true
- }*/
}
switchPreference {