diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt index 285137a48..0f0d1e1d7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt @@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.Source +import eu.kanade.tachiyomi.source.getPreferenceKey import eu.kanade.tachiyomi.ui.base.controller.NoToolbarElevationController import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction @@ -133,7 +134,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : val sourcePrefs = mutableListOf() val block: (@DSL SwitchPreferenceCompat).() -> Unit = { - key = getSourceKey(source.id) + key = source.getPreferenceKey() title = when { isMultiSource && !isMultiLangSingleSource -> source.toString() else -> LocaleHelper.getSourceDisplayName(it.key, context) @@ -231,10 +232,6 @@ class ExtensionDetailsController(bundle: Bundle? = null) : return id.toString() !in preferences.hiddenCatalogues().get() } - private fun getSourceKey(sourceId: Long): String { - return "source_$sourceId" - } - private fun getPreferenceThemeContext(): Context { val tv = TypedValue() activity!!.theme.resolveAttribute(R.attr.preferenceTheme, tv, true) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt index 41abd3ec8..7867f6c1d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt @@ -28,6 +28,7 @@ import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore import eu.kanade.tachiyomi.databinding.SourcePreferencesControllerBinding import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.Source +import eu.kanade.tachiyomi.source.getPreferenceKey import eu.kanade.tachiyomi.ui.base.controller.NucleusController import timber.log.Timber @@ -107,7 +108,7 @@ class SourcePreferencesController(bundle: Bundle? = null) : val context = screen.context val dataStore = SharedPreferencesDataStore( - context.getSharedPreferences("source_${source.id}", Context.MODE_PRIVATE) + context.getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE) ) if (source is ConfigurableSource) {