diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index b4ba29ac6..cd5c30393 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -166,7 +166,7 @@ class EhApplication : Application(), ImageLoaderFactory { } } - val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore(appCtx)) } + val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore) } val ehDatabase by lazy { roomDb("eh.db") { allowMainThreadQueries() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt b/app/src/main/java/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt index f028148d2..59a54a363 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt @@ -1,8 +1,7 @@ package eu.kanade.tachiyomi.core.preference -import android.content.Context import android.content.SharedPreferences -import androidx.preference.PreferenceManager +import com.hippo.ehviewer.Settings import eu.kanade.tachiyomi.core.preference.AndroidPreference.BooleanPrimitive import eu.kanade.tachiyomi.core.preference.AndroidPreference.FloatPrimitive import eu.kanade.tachiyomi.core.preference.AndroidPreference.IntPrimitive @@ -13,11 +12,9 @@ import eu.kanade.tachiyomi.core.preference.AndroidPreference.StringSetPrimitive import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.callbackFlow -class AndroidPreferenceStore( - context: Context, -) : PreferenceStore { +object AndroidPreferenceStore : PreferenceStore { - private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + private val sharedPreferences = Settings.prefs private val keyFlow = sharedPreferences.keyFlow