From 9eec9a9957a9bb671eb405233688b997b28e612a Mon Sep 17 00:00:00 2001 From: Koitharu Date: Fri, 5 Jan 2024 16:40:48 +0200 Subject: [PATCH] Fix favorites backup #621 --- .../org/koitharu/kotatsu/core/backup/BackupRepository.kt | 2 +- .../org/koitharu/kotatsu/favourites/data/FavouritesDao.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt index 82ed23103..2071ae6d9 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt @@ -55,7 +55,7 @@ class BackupRepository @Inject constructor( var offset = 0 val entry = BackupEntry(BackupEntry.Name.FAVOURITES, JSONArray()) while (true) { - val favourites = db.getFavouritesDao().findAll(offset, PAGE_SIZE) + val favourites = db.getFavouritesDao().findAllRaw(offset, PAGE_SIZE) if (favourites.isEmpty()) { break } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt index deb4b822d..a7c4df2c8 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt @@ -46,6 +46,10 @@ abstract class FavouritesDao { ) abstract suspend fun findAll(offset: Int, limit: Int): List + @Transaction + @Query("SELECT * FROM favourites WHERE deleted_at = 0 ORDER BY created_at DESC LIMIT :limit OFFSET :offset") + abstract suspend fun findAllRaw(offset: Int, limit: Int): List + @Transaction @Query( "SELECT * FROM favourites WHERE category_id = :categoryId AND deleted_at = 0 " +