javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases 3 Wiki Activity

Fix compatibility with older backups

Browse Source 
Fixes #3413
This commit is contained in:
AntsyLich
2026-06-16 03:17:20 +06:00
parent e3610cbe2c
commit 5896d2c939
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt
+2 -1
View File
@@ -4,6 +4,7 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.protobuf.ProtoNumber import kotlinx.serialization.protobuf.ProtoNumber
import mihon.core.common.extensions.EMPTY import mihon.core.common.extensions.EMPTY
import mihon.core.common.extensions.JsonObjectEmptyBytes
import tachiyomi.data.MemoColumnAdapter import tachiyomi.data.MemoColumnAdapter
import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.Chapter
@@ -25,7 +26,7 @@ class BackupChapter(
@ProtoNumber(10) var sourceOrder: Long = 0, @ProtoNumber(10) var sourceOrder: Long = 0,
@ProtoNumber(11) var lastModifiedAt: Long = 0, @ProtoNumber(11) var lastModifiedAt: Long = 0,
@ProtoNumber(12) var version: Long = 0, @ProtoNumber(12) var version: Long = 0,
@ProtoNumber(13) var memo: ByteArray = byteArrayOf(), @ProtoNumber(13) var memo: ByteArray = JsonObjectEmptyBytes,
) { ) {
fun toChapterImpl(): Chapter { fun toChapterImpl(): Chapter {
return Chapter.create().copy( return Chapter.create().copy(
app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
+2 -1
View File
@@ -5,6 +5,7 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.protobuf.ProtoNumber import kotlinx.serialization.protobuf.ProtoNumber
import mihon.core.common.extensions.EMPTY import mihon.core.common.extensions.EMPTY
import mihon.core.common.extensions.JsonObjectEmptyBytes
import tachiyomi.data.MemoColumnAdapter import tachiyomi.data.MemoColumnAdapter
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
@@ -46,7 +47,7 @@ class BackupManga(
@ProtoNumber(109) var version: Long = 0, @ProtoNumber(109) var version: Long = 0,
@ProtoNumber(110) var notes: String = "", @ProtoNumber(110) var notes: String = "",
@ProtoNumber(111) var initialized: Boolean = false, @ProtoNumber(111) var initialized: Boolean = false,
@ProtoNumber(112) var memo: ByteArray = byteArrayOf(), @ProtoNumber(112) var memo: ByteArray = JsonObjectEmptyBytes,
) { ) {
fun getMangaImpl(): Manga { fun getMangaImpl(): Manga {
return Manga.create().copy( return Manga.create().copy(
core/common/src/main/kotlin/mihon/core/common/extensions/JsonObject.kt
+2
View File
@@ -4,5 +4,7 @@ import kotlinx.serialization.json.JsonObject
val JsonObjectEmpty = JsonObject(emptyMap()) val JsonObjectEmpty = JsonObject(emptyMap())
val JsonObjectEmptyBytes = byteArrayOf(0x7B, 0x7D)
val JsonObject.Companion.EMPTY: JsonObject val JsonObject.Companion.EMPTY: JsonObject
inline get() = JsonObjectEmpty inline get() = JsonObjectEmpty