diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt index f05cc17f2a..7141d0ef86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt @@ -664,6 +664,7 @@ class MangaDetailsController : BaseController, chapterList = presenter.chapters.subList(startingPosition - 1, position) } downloadChapters(chapterList) + presenter.fetchChapters(false) adapter?.removeSelection(startingPosition) (recycler.findViewHolderForAdapterPosition(startingPosition) as? BaseFlexibleViewHolder) ?.toggleActivation() @@ -687,7 +688,6 @@ class MangaDetailsController : BaseController, popup.menuInflater.inflate(R.menu.chapter_single, popup.menu) popup.setOnMenuItemClickListener { menuItem -> - val chapters = listOf(item) when (menuItem.itemId) { R.id.action_mark_previous_as_read -> markPreviousAsRead(item) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index c826f62ad8..201f2011d3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -191,15 +191,6 @@ class MangaDetailsPresenter( controller.refreshAdapter() } - /** - * Sets the sorting method and requests an UI update. - * @param sort the sorting mode. - */ - fun setSorting(sort: Int) { - manga.sorting = sort - db.updateFlags(manga).executeAsBlocking() - } - /** * Whether the display only downloaded filter is enabled. */ @@ -337,17 +328,6 @@ class MangaDetailsPresenter( chapters.filter { !it.read && it.status == Download.NOT_DOWNLOADED }.distinctBy { it.name } .sortedByDescending { it.source_order } - /** - * Returns the next unread chapter or null if everything is read. - */ - fun getNewestChapterTime(): Long? { - return chapters.maxBy { it.date_upload }?.date_upload - } - - fun getLatestChapter(): Float? { - return chapters.maxBy { it.chapter_number }?.chapter_number - } - fun startDownloadingNow(chapter: Chapter) { downloadManager.startDownloadNow(chapter) } @@ -360,10 +340,6 @@ class MangaDetailsPresenter( downloadManager.downloadChapters(manga, chapters.filter { !it.isDownloaded }) } - fun restartDownloads() { - if (downloadManager.isPaused()) downloadManager.startDownloads() - } - /** * Deletes the given list of chapter. * @param chapters the list of chapters to delete. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt index 6f3e01cfa8..dece86fe00 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt @@ -5,7 +5,6 @@ import eu.davidea.flexibleadapter.items.AbstractSectionableItem import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.util.system.HashCode abstract class BaseChapterItem>( val chapter: @@ -41,6 +40,6 @@ Chapter, } override fun hashCode(): Int { - return HashCode.generate(chapter.id ?: 0L, chapter.name) + return (chapter.id ?: 0L).hashCode() } }