admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split source preferences from PreferencesHelper (#8029)

Browse Source 
(cherry picked from commit 30b3b2d3ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt
This commit is contained in:
Andreas
2022-09-18 16:36:41 +02:00
committed by Jobobby04
parent 41c9c20e26
commit 5d1dfb5290
59 changed files with 286 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/util/DataSaver.kt
+3 -3
View File
@@ -1,7 +1,7 @@
package exh.util
import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.tachiyomi.core.preference.Preference
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.online.HttpSource
@@ -30,7 +30,7 @@ interface DataSaver {
}
}
fun DataSaver(source: Source, preferences: PreferencesHelper): DataSaver {
fun DataSaver(source: Source, preferences: SourcePreferences): DataSaver {
return if (preferences.dataSaver().get() && source.id.toString() !in preferences.dataSaverExcludedSources().get()) {
return DataSaverImpl(preferences)
} else {
@@ -38,7 +38,7 @@ fun DataSaver(source: Source, preferences: PreferencesHelper): DataSaver {
}
}
private class DataSaverImpl(preferences: PreferencesHelper) : DataSaver {
private class DataSaverImpl(preferences: SourcePreferences) : DataSaver {
private val dataSavedServer = preferences.dataSaverServer().get().trimEnd('/')
private val ignoreJpg = preferences.dataSaverIgnoreJpeg().get()