From 2c143155d620c4349f90d46b4470bb057ec3ae47 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Thu, 15 Apr 2021 04:16:51 -0400 Subject: [PATCH] Fix restore adding unknown status to items --- .../kanade/tachiyomi/data/backup/full/FullBackupRestore.kt | 2 +- .../kanade/tachiyomi/data/backup/full/models/BackupManga.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt index 8528f5f6af..98bf2f6a69 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt @@ -66,7 +66,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa val categories = backupManga.categories val history = backupManga.history val tracks = backupManga.getTrackingImpl() - val customManga = backupManga.getCustomMangaInfo(manga) + val customManga = backupManga.getCustomMangaInfo() try { restoreMangaData(manga, chapters, categories, history, tracks, backupCategories, customManga) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt index 3005868022..0c7ed46256 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt @@ -70,13 +70,13 @@ data class BackupManga( } } - fun getCustomMangaInfo(manga: Manga): CustomMangaManager.MangaJson? { + fun getCustomMangaInfo(): CustomMangaManager.MangaJson? { if (customTitle != null || customArtist != null || customAuthor != null || customDescription != null || customGenre != null || - manga.status != customStatus + customStatus != 0 ) { return CustomMangaManager.MangaJson( id = 0L, @@ -85,7 +85,7 @@ data class BackupManga( artist = customArtist, description = customDescription, genre = customGenre?.toTypedArray(), - status = if (manga.status != customStatus) customStatus else null + status = customStatus.takeUnless { it == 0 } ) } return null