From c8de918e46bdbe4f080520e72c643e5c4517c311 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 16 Nov 2022 14:17:26 -0500
Subject: [PATCH] Cherry pick fixes

---
 .../domain/chapter/model/ChapterFilter.kt     |  2 +-
 .../data/download/DownloadManager.kt          |  4 +-
 .../data/download/DownloadPendingDeleter.kt   | 40 -------------------
 .../tachiyomi/ui/manga/MangaScreenModel.kt    |  1 -
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt b/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
index 8a2688d1a..718c4eab5 100644
--- a/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
@@ -34,7 +34,7 @@ fun List<Chapter>.applyFilters(manga: Manga, downloadManager: DownloadManager):
             }
         }
         .filter { chapter ->
-            val downloaded = downloadManager.isChapterDownloaded(chapter.name, chapter.scanlator,/* SY --> */ manga.ogTitle /* SY <-- */, manga.source)
+            val downloaded = downloadManager.isChapterDownloaded(chapter.name, chapter.scanlator, /* SY --> */ manga.ogTitle /* SY <-- */, manga.source)
             val downloadState = when {
                 downloaded -> Download.State.DOWNLOADED
                 else -> Download.State.NOT_DOWNLOADED
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
index 0c8a33ef0..c7e5661fd 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@@ -328,8 +328,8 @@ class DownloadManager(
         if (removeRead) {
             val readChapters = allChapters.filter { it.read }
             val readChapterDirs = provider.findChapterDirs(readChapters, manga, source)
-            readChapterDirs.forEach { it.delete() }
-            cleaned += readChapterDirs.size
+            readChapterDirs.second.forEach { it.delete() }
+            cleaned += readChapterDirs.second.size
             cache.removeChapters(readChapters, manga)
         }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
index a8d6ad92e..f2aefcdf5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
@@ -184,44 +184,4 @@ class DownloadPendingDeleter(
         val title: String,
         val source: Long,
     )
-
-    /**
-     * Returns a manga entry from a manga model.
-     */
-    private fun Manga.toEntry(): MangaEntry {
-        return MangaEntry(id!!, url, /* SY --> */ ogTitle /* SY <-- */, source)
-    }
-
-    /**
-     * Returns a chapter entry from a chapter model.
-     */
-    private fun Chapter.toEntry(): ChapterEntry {
-        return ChapterEntry(id!!, url, name, scanlator)
-    }
-
-    /**
-     * Returns a manga model from a manga entry.
-     */
-    private fun MangaEntry.toModel(): Manga {
-        return Manga.create().copy(
-            url = url,
-            // SY -->
-            ogTitle = title,
-            // SY <--
-            source = source,
-            id = id,
-        )
-    }
-
-    /**
-     * Returns a chapter model from a chapter entry.
-     */
-    private fun ChapterEntry.toModel(): Chapter {
-        return Chapter.create().copy(
-            id = id,
-            url = url,
-            name = name,
-            scanlator = scanlator,
-        )
-    }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
index 85b0bb7f7..392947026 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
@@ -138,7 +138,6 @@ class MangaInfoScreenModel(
     private val downloadCache: DownloadCache = Injekt.get(),
     private val getMangaAndChapters: GetMangaWithChapters = Injekt.get(),
     // SY -->
-    private val uiPreferences: UiPreferences = Injekt.get(),
     private val readerPreferences: ReaderPreferences = Injekt.get(),
     private val getManga: GetManga = Injekt.get(),
     private val setMangaFilteredScanlators: SetMangaFilteredScanlators = Injekt.get(),