Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Likely fixed the full backup crashing for some users

Browse Source
This commit is contained in:
Jobobby04 2020-10-12 23:03:38 -04:00
parent 22f81758b0
commit 3dd10df45e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
View File

@ -168,7 +168,7 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() {
BackupSavedSearch( BackupSavedSearch(
content.name, content.name,
content.query, content.query,
content.filters, content.filters.toString(),
sourceId sourceId
) )
} }
@ -494,7 +494,7 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() {
BackupSavedSearch( BackupSavedSearch(
content.name, content.name,
content.query, content.query,
content.filters, content.filters.toString(),
sourceId sourceId
) )
} }
@ -508,7 +508,7 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() {
JsonSavedSearch( JsonSavedSearch(
it.name, it.name,
it.query, it.query,
it.filterList Json.decodeFromString(it.filterList)
) )
) )
} + preferences.eh_savedSearches().get() } + preferences.eh_savedSearches().get()

4
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt
View File

@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.data.backup.full.models
import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.buildJsonArray
import kotlinx.serialization.protobuf.ProtoNumber import kotlinx.serialization.protobuf.ProtoNumber
/* /*
@ -14,6 +12,6 @@ import kotlinx.serialization.protobuf.ProtoNumber
data class BackupSavedSearch( data class BackupSavedSearch(
@ProtoNumber(1) val name: String, @ProtoNumber(1) val name: String,
@ProtoNumber(2) val query: String = "", @ProtoNumber(2) val query: String = "",
@ProtoNumber(3) val filterList: JsonArray = buildJsonArray {}, @ProtoNumber(3) val filterList: String = "",
@ProtoNumber(4) val source: Long = 0 @ProtoNumber(4) val source: Long = 0
) )