From 1eca67f133a0cd57d5e0c6207dde7e0fdd557cac Mon Sep 17 00:00:00 2001 From: HapeLee <63206378+HapeLee@users.noreply.github.com> Date: Wed, 10 Jun 2026 23:55:46 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E6=92=A4=E5=9B=9E=20mostRecentlyRead?= =?UTF-8?q?Book=20=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/data/dao/BookDao.kt | 3 --- .../java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt | 2 +- .../main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/dao/BookDao.kt b/app/src/main/java/io/legado/app/data/dao/BookDao.kt index 377b25033..7af033094 100644 --- a/app/src/main/java/io/legado/app/data/dao/BookDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookDao.kt @@ -648,9 +648,6 @@ interface BookDao { @get:Query("SELECT * FROM books where type & ${BookType.text} > 0 ORDER BY durChapterTime DESC limit 1") val lastReadBook: Book? - @get:Query("SELECT * FROM books ORDER BY durChapterTime DESC limit 1") - val mostRecentlyReadBook: Book? - @get:Query("SELECT bookUrl FROM books") val allBookUrls: List diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt index 40da3dc2e..05bd4fa0a 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaViewModel.kt @@ -65,7 +65,7 @@ class ReadMangaViewModel( ReadManga.chapterChanged = intent.getBooleanExtra("chapterChanged", false) val bookUrl = intent.getStringExtra("bookUrl") val book = when { - bookUrl.isNullOrEmpty() -> appDb.bookDao.mostRecentlyReadBook + bookUrl.isNullOrEmpty() -> appDb.bookDao.lastReadBook else -> appDb.bookDao.getBook(bookUrl) } ?: ReadManga.book when { diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 010203e2b..470278f74 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -1668,7 +1668,7 @@ class ReadBookViewModel( fun initReadBookConfig(intent: Intent) { val bookUrl = intent.getStringExtra("bookUrl") val book = when { - bookUrl.isNullOrEmpty() -> appDb.bookDao.mostRecentlyReadBook + bookUrl.isNullOrEmpty() -> appDb.bookDao.lastReadBook else -> appDb.bookDao.getBook(bookUrl) } ?: return ReadBook.upReadBookConfig(book) @@ -1680,7 +1680,7 @@ class ReadBookViewModel( ReadBook.chapterChanged = intent.getBooleanExtra("chapterChanged", false) val bookUrl = intent.getStringExtra("bookUrl") val book = when { - bookUrl.isNullOrEmpty() -> appDb.bookDao.mostRecentlyReadBook + bookUrl.isNullOrEmpty() -> appDb.bookDao.lastReadBook else -> appDb.bookDao.getBook(bookUrl) } ?: ReadBook.book when {