diff --git a/data/src/main/java/tachiyomi/data/LibraryQuery.kt b/data/src/main/java/tachiyomi/data/LibraryQuery.kt index f67e5d58c..3e38cc63e 100644 --- a/data/src/main/java/tachiyomi/data/LibraryQuery.kt +++ b/data/src/main/java/tachiyomi/data/LibraryQuery.kt @@ -20,8 +20,8 @@ private val mapper = { cursor: SqlCursor -> status = cursor.getLong(8)!!, thumbnail_url = cursor.getString(9), favorite = cursor.getLong(10)!! == 1L, - last_update = cursor.getLong(11) ?: 0, - next_update = null, + last_update = cursor.getLong(11), + next_update = cursor.getLong(12), initialized = cursor.getLong(13)!! == 1L, viewer = cursor.getLong(14)!!, chapter_flags = cursor.getLong(15)!!, @@ -29,13 +29,14 @@ private val mapper = { cursor: SqlCursor -> date_added = cursor.getLong(17)!!, filtered_scanlators = cursor.getString(18)?.let(listOfStringsAndAdapter::decode), update_strategy = updateStrategyAdapter.decode(cursor.getLong(19)!!), - totalCount = cursor.getLong(20)!!, - readCount = cursor.getLong(21)!!, - latestUpload = cursor.getLong(22)!!, - chapterFetchedAt = cursor.getLong(23)!!, - lastRead = cursor.getLong(24)!!, - bookmarkCount = cursor.getLong(25)!!, - category = cursor.getLong(26)!!, + calculate_interval = cursor.getLong(20)!!, + totalCount = cursor.getLong(21)!!, + readCount = cursor.getLong(22)!!, + latestUpload = cursor.getLong(23)!!, + chapterFetchedAt = cursor.getLong(24)!!, + lastRead = cursor.getLong(25)!!, + bookmarkCount = cursor.getLong(26)!!, + category = cursor.getLong(27)!!, ) } diff --git a/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt index e5448c48b..b40c98422 100644 --- a/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt @@ -6,7 +6,7 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.view.LibraryView val mangaMapper: (Long, Long, String, String?, String?, String?, List?, String, Long, String?, Boolean, Long?, Long?, Boolean, Long, Long, Long, Long, List?, UpdateStrategy, Long) -> Manga = - { id, source, url, artist, author, description, genre, title, status, thumbnailUrl, favorite, lastUpdate, _, initialized, viewerFlags, chapterFlags, coverLastModified, dateAdded, filteredScanlators, updateStrategy, calculateInterval -> + { id, source, url, artist, author, description, genre, title, status, thumbnailUrl, favorite, lastUpdate, nextUpdate, initialized, viewerFlags, chapterFlags, coverLastModified, dateAdded, filteredScanlators, updateStrategy, calculateInterval -> Manga( id = id, source = source, @@ -81,6 +81,7 @@ val libraryViewMapper: (LibraryView) -> LibraryManga = { source = it.source, favorite = it.favorite, lastUpdate = it.last_update ?: 0, + nextUpdate = it.next_update ?: 0, dateAdded = it.date_added, viewerFlags = it.viewer, chapterFlags = it.chapter_flags, @@ -96,6 +97,7 @@ val libraryViewMapper: (LibraryView) -> LibraryManga = { updateStrategy = it.update_strategy, initialized = it.initialized, filteredScanlators = it.filtered_scanlators, + calculateInterval = it.calculate_interval.toInt(), ), it.category, it.totalCount,