Skip to content

Commit 06cdafa

Browse files
committed
sync: Follow backup changes on commit f696f20
1 parent b83de39 commit 06cdafa

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.backup.create.BackupOptions
88
import eu.kanade.tachiyomi.data.backup.models.Backup
99
import eu.kanade.tachiyomi.data.backup.models.BackupChapter
1010
import eu.kanade.tachiyomi.data.backup.models.BackupManga
11-
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
1211
import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
1312
import eu.kanade.tachiyomi.data.backup.restore.RestoreOptions
1413
import eu.kanade.tachiyomi.data.backup.restore.restorers.MangaRestorer
@@ -202,7 +201,7 @@ class SyncManager(
202201
val cacheFile = File(context.cacheDir, "tachiyomi_sync_data.proto.gz")
203202
return try {
204203
cacheFile.outputStream().use { output ->
205-
output.write(ProtoBuf.encodeToByteArray(BackupSerializer, backup))
204+
output.write(ProtoBuf.encodeToByteArray(Backup.serializer(), backup))
206205
Uri.fromFile(cacheFile)
207206
}
208207
} catch (e: IOException) {

app/src/main/java/eu/kanade/tachiyomi/data/sync/service/SyncYomiSyncService.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.data.sync.service
33
import android.content.Context
44
import eu.kanade.domain.sync.SyncPreferences
55
import eu.kanade.tachiyomi.data.backup.models.Backup
6-
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
76
import eu.kanade.tachiyomi.data.sync.SyncNotifier
87
import eu.kanade.tachiyomi.network.GET
98
import eu.kanade.tachiyomi.network.PUT
@@ -104,7 +103,7 @@ class SyncYomiSyncService(
104103
}
105104

106105
return try {
107-
val backup = protoBuf.decodeFromByteArray(BackupSerializer, byteArray)
106+
val backup = ProtoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
108107
return Pair(SyncData(backup = backup), newETag)
109108
} catch (_: SerializationException) {
110109
logcat(LogPriority.INFO) {
@@ -147,7 +146,7 @@ class SyncYomiSyncService(
147146
.writeTimeout(timeout, TimeUnit.SECONDS)
148147
.build()
149148

150-
val byteArray = protoBuf.encodeToByteArray(BackupSerializer, backup)
149+
val byteArray = ProtoBuf.encodeToByteArray(Backup.serializer(), backup)
151150
if (byteArray.isEmpty()) {
152151
throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error))
153152
}

0 commit comments

Comments
 (0)