From 7654feb6a8781551e9af9e345ab5df1b856b89e9 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 18 Apr 2021 13:07:53 -0400 Subject: [PATCH] Fix chapter read status not being migrated (fixes #4892) --- .../migration/search/SearchPresenter.kt | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt index 204f6cbecd..c1a254e095 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt @@ -104,23 +104,22 @@ class SearchPresenter( val prevMangaChapters = db.getChapters(prevManga).executeAsBlocking() val maxChapterRead = prevMangaChapters .filter { it.read } - .maxOfOrNull { it.chapter_number } - if (maxChapterRead != null) { - val dbChapters = db.getChapters(manga).executeAsBlocking() - for (chapter in dbChapters) { - if (chapter.isRecognizedNumber) { - val prevChapter = prevMangaChapters - .find { it.isRecognizedNumber && it.chapter_number == chapter.chapter_number } - if (prevChapter != null) { - chapter.date_fetch = prevChapter.date_fetch - chapter.bookmark = prevChapter.bookmark - } else if (chapter.chapter_number <= maxChapterRead) { - chapter.read = true - } + .maxOfOrNull { it.chapter_number } ?: 0f + val dbChapters = db.getChapters(manga).executeAsBlocking() + for (chapter in dbChapters) { + if (chapter.isRecognizedNumber) { + val prevChapter = prevMangaChapters + .find { it.isRecognizedNumber && it.chapter_number == chapter.chapter_number } + if (prevChapter != null) { + chapter.date_fetch = prevChapter.date_fetch + chapter.bookmark = prevChapter.bookmark + } + if (chapter.chapter_number <= maxChapterRead) { + chapter.read = true } } - db.insertChapters(dbChapters).executeAsBlocking() } + db.insertChapters(dbChapters).executeAsBlocking() } // Update categories