diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 30019d3a0..65e4ce4ce 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -198,6 +198,4 @@ object PreferenceKeys { const val eh_aggressivePageLoading = "eh_aggressive_page_loading" const val eh_hl_useHighQualityThumbs = "eh_hl_hq_thumbs" - - const val eh_forceSortEhVersionsAsc = "eh_force_sort_eh_versions_asc" } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index febb6986c..08e4053e4 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -271,6 +271,4 @@ class PreferencesHelper(val context: Context) { fun eh_aggressivePageLoading() = rxPrefs.getBoolean(Keys.eh_aggressivePageLoading, false) fun eh_hl_useHighQualityThumbs() = rxPrefs.getBoolean(Keys.eh_hl_useHighQualityThumbs, false) - - fun eh_forceSortEhVersionsAsc() = rxPrefs.getBoolean(Keys.eh_forceSortEhVersionsAsc, true) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 2fec11b4b..5b87b9347 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -185,7 +185,7 @@ class EHentai(override val id: Long, }!!.nextElementSibling().text()).time } // Build and append the rest of the galleries - listOf(self) + newDisplay.mapIndexed { index, newGallery -> + newDisplay.mapIndexed { index, newGallery -> val link = newGallery.attr("href") val name = newGallery.text() val posted = (newGallery.nextSibling() as TextNode).text().removePrefix(", added ") @@ -195,7 +195,7 @@ class EHentai(override val id: Long, this.chapter_number = index + 2f this.date_upload = EX_DATE_FORMAT.parse(posted).time } - } + }.reversed() + self }.toObservable() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt index d2a185c09..785e1b5aa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt @@ -146,8 +146,6 @@ class ChaptersController : NucleusController(), val menuFilterUnread = menu.findItem(R.id.action_filter_unread) val menuFilterDownloaded = menu.findItem(R.id.action_filter_downloaded) val menuFilterBookmarked = menu.findItem(R.id.action_filter_bookmarked) - val menuSort = menu.findItem(R.id.action_sort) - val menuSortingMode = menu.findItem(R.id.action_sorting_mode) // Set correct checkbox values. menuFilterRead.isChecked = presenter.onlyRead() @@ -155,10 +153,6 @@ class ChaptersController : NucleusController(), menuFilterDownloaded.isChecked = presenter.onlyDownloaded() menuFilterBookmarked.isChecked = presenter.onlyBookmarked() - val showSortOptions = !presenter.isSortingForced() - menuSort.isVisible = showSortOptions - menuSortingMode.isVisible = showSortOptions - if (presenter.onlyRead()) //Disable unread filter option if read filter is enabled. menuFilterUnread.isEnabled = false @@ -419,8 +413,7 @@ class ChaptersController : NucleusController(), private fun markPreviousAsRead(chapter: ChapterItem) { val adapter = adapter ?: return - val chapters = if (presenter.sortDescending() - || presenter.isSortingForced()) adapter.items.reversed() else adapter.items + val chapters = if (presenter.sortDescending()) adapter.items.reversed() else adapter.items val chapterPos = chapters.indexOf(chapter) if (chapterPos != -1) { markAsRead(chapters.take(chapterPos)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt index 4c2be02fe..e97107fd6 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt @@ -447,10 +447,6 @@ class ChaptersPresenter( * Whether the sorting method is descending or ascending. */ fun sortDescending(): Boolean { - return !isSortingForced() && manga.sortDescending() + return manga.sortDescending() } - - fun isSortingForced() = source.isEhBasedSource() - && preferences.eh_forceSortEhVersionsAsc().getOrDefault() - } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt index e327e9183..4299d4b5e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt @@ -157,12 +157,6 @@ class SettingsEhController : SettingsController() { onChange { preferences.imageQuality().reconfigure() } }.dependency = PreferenceKeys.eh_enableExHentai - switchPreference { - title = "Force ascending sort on gallery versions" - key = PreferenceKeys.eh_forceSortEhVersionsAsc - defaultValue = true - } - preferenceCategory { title = "Favorites sync"