Cherry pick fixes

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

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() }
+            readChapterDirs.second.forEach { it.delete() }
-            cleaned += readChapterDirs.size
+            cleaned += readChapterDirs.second.size
             cache.removeChapters(readChapters, manga)
         }
 

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,
-        )
-    }
 }

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(),