Move chapter preferences from PreferencesHelper to LibraryPrefrences (#8061)
(cherry picked from commit b5dca2eb09)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
This commit is contained in:
@@ -471,6 +471,27 @@ object EXHMigrations {
|
||||
BackupCreatorJob.setupTask(context)
|
||||
}
|
||||
}
|
||||
if (oldVersion under 41) {
|
||||
@Suppress("NAME_SHADOWING")
|
||||
val preferences = listOf(
|
||||
libraryPreferences.filterChapterByRead(),
|
||||
libraryPreferences.filterChapterByDownloaded(),
|
||||
libraryPreferences.filterChapterByBookmarked(),
|
||||
libraryPreferences.sortChapterBySourceOrNumber(),
|
||||
libraryPreferences.displayChapterByNameOrNumber(),
|
||||
libraryPreferences.sortChapterByAscendingOrDescending(),
|
||||
)
|
||||
|
||||
prefs.edit {
|
||||
preferences.forEach { preference ->
|
||||
val key = preference.key()
|
||||
val value = prefs.getInt(key, Int.MIN_VALUE)
|
||||
if (value == Int.MIN_VALUE) return@forEach
|
||||
remove(key)
|
||||
putLong(key, value.toLong())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// if (oldVersion under 1) { } (1 is current release version)
|
||||
// do stuff here when releasing changed crap
|
||||
|
||||
@@ -6,7 +6,7 @@ import eu.kanade.domain.manga.model.Manga
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
import eu.kanade.tachiyomi.source.online.MetadataSource
|
||||
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
|
||||
import eu.kanade.tachiyomi.util.lang.launchNonCancellableIO
|
||||
import eu.kanade.tachiyomi.util.lang.launchNonCancellable
|
||||
import exh.metadata.metadata.base.RaisedSearchMetadata
|
||||
import exh.source.getMainSource
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
@@ -25,11 +25,11 @@ class MetadataViewPresenter(
|
||||
override fun onCreate(savedState: Bundle?) {
|
||||
super.onCreate(savedState)
|
||||
|
||||
presenterScope.launchNonCancellableIO {
|
||||
presenterScope.launchNonCancellable {
|
||||
val metadataSource = source.getMainSource<MetadataSource<*, *>>()
|
||||
if (metadataSource == null) {
|
||||
_state.value = MetadataViewState.SourceNotFound
|
||||
return@launchNonCancellableIO
|
||||
return@launchNonCancellable
|
||||
}
|
||||
|
||||
_state.value = when (val flatMetadata = getFlatMetadataById.await(manga.id)) {
|
||||
|
||||
Reference in New Issue
Block a user