diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt index 656f42e6e..0065f5f44 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt @@ -11,7 +11,7 @@ import com.pushtorefresh.storio.sqlite.queries.InsertQuery import com.pushtorefresh.storio.sqlite.queries.UpdateQuery import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.ChapterImpl -import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_BOOKMARKED +import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_BOOKMARK import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_CHAPTER_NUMBER import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_DATE_FETCH import eu.kanade.tachiyomi.data.database.tables.ChapterTable.COL_DATE_UPLOAD @@ -48,7 +48,7 @@ class ChapterPutResolver : DefaultPutResolver() { put(COL_URL, obj.url) put(COL_NAME, obj.name) put(COL_READ, obj.read) - put(COL_BOOKMARKED, obj.bookmark) + put(COL_BOOKMARK, obj.bookmark) put(COL_DATE_FETCH, obj.date_fetch) put(COL_DATE_UPLOAD, obj.date_upload) put(COL_LAST_PAGE_READ, obj.last_page_read) @@ -65,7 +65,7 @@ class ChapterGetResolver : DefaultGetResolver() { url = cursor.getString(cursor.getColumnIndex(COL_URL)) name = cursor.getString(cursor.getColumnIndex(COL_NAME)) read = cursor.getInt(cursor.getColumnIndex(COL_READ)) == 1 - bookmark = cursor.getInt(cursor.getColumnIndex(COL_BOOKMARKED)) == 1 + bookmark = cursor.getInt(cursor.getColumnIndex(COL_BOOKMARK)) == 1 date_fetch = cursor.getLong(cursor.getColumnIndex(COL_DATE_FETCH)) date_upload = cursor.getLong(cursor.getColumnIndex(COL_DATE_UPLOAD)) last_page_read = cursor.getInt(cursor.getColumnIndex(COL_LAST_PAGE_READ)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt index f994ddcec..18009d711 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt @@ -27,7 +27,7 @@ class ChapterProgressPutResolver : PutResolver() { fun mapToContentValues(chapter: Chapter) = ContentValues(3).apply { put(ChapterTable.COL_READ, chapter.read) - put(ChapterTable.COL_BOOKMARKED, chapter.bookmark) + put(ChapterTable.COL_BOOKMARK, chapter.bookmark) put(ChapterTable.COL_LAST_PAGE_READ, chapter.last_page_read) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt index 6405f45f9..e28f848cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/ChapterTable.kt @@ -14,7 +14,7 @@ object ChapterTable { const val COL_READ = "read" - const val COL_BOOKMARKED = "bookmark" + const val COL_BOOKMARK = "bookmark" const val COL_DATE_FETCH = "date_fetch" @@ -33,7 +33,7 @@ object ChapterTable { $COL_URL TEXT NOT NULL, $COL_NAME TEXT NOT NULL, $COL_READ BOOLEAN NOT NULL, - $COL_BOOKMARKED BOOLEAN NOT NULL, + $COL_BOOKMARK BOOLEAN NOT NULL, $COL_LAST_PAGE_READ INT NOT NULL, $COL_CHAPTER_NUMBER FLOAT NOT NULL, $COL_SOURCE_ORDER INTEGER NOT NULL, @@ -50,6 +50,6 @@ object ChapterTable { get() = "ALTER TABLE $TABLE ADD COLUMN $COL_SOURCE_ORDER INTEGER DEFAULT 0" val bookmarkUpdateQuery: String - get() = "ALTER TABLE $TABLE ADD COLUMN $COL_BOOKMARKED BOOLEAN DEFAULT FALSE" + get() = "ALTER TABLE $TABLE ADD COLUMN $COL_BOOKMARK BOOLEAN DEFAULT FALSE" }