From 91b49f8a0c54d6d657a7cc1a7808d9caf738ee07 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 21 Apr 2021 17:41:43 -0400
Subject: [PATCH] Consider sort direction when downloading next n chapters
 (fixes #4916)

(cherry picked from commit 41a747c7e799a6cab936e9f4a14979ca7587ef39)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
---
 .../tachiyomi/ui/manga/MangaController.kt     | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
index 1eea4ad64..f60188366 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@@ -1424,15 +1424,26 @@ class MangaController :
 
     // OVERFLOW MENU DIALOGS
 
-    private fun getUnreadChaptersSorted() = /* SY --> */ if (presenter.source.isEhBasedSource()) presenter.chapters
-        .sortedWith(presenter.getChapterSort())
-        .filter { !it.read && it.status == Download.State.NOT_DOWNLOADED }
-        .distinctBy { it.name }
-    else /* SY <-- */ presenter.chapters
-        .sortedWith(presenter.getChapterSort())
-        .filter { !it.read && it.status == Download.State.NOT_DOWNLOADED }
-        .distinctBy { it.name }
-        .reversed()
+    private fun getUnreadChaptersSorted(): List<ChapterItem> {
+        val chapters = presenter.chapters
+            .sortedWith(presenter.getChapterSort())
+            .filter { !it.read && it.status == Download.State.NOT_DOWNLOADED }
+            .distinctBy { it.name }
+            // SY -->
+            .let {
+                if (presenter.source.isEhBasedSource()) {
+                    it.reversed()
+                } else {
+                    it
+                }
+            }
+        // SY <--
+        return if (presenter.sortDescending()) {
+            chapters.reversed()
+        } else {
+            chapters
+        }
+    }
 
     private fun downloadChapters(choice: Int) {
         val chaptersToDownload = when (choice) {