From 6e1adf6e04af77ee77c38710d8fa907f0bea9fc1 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 20 Mar 2021 10:03:13 -0400 Subject: [PATCH] Fix offline restore ignoring manga from not installed sources (fixes #4679) (cherry picked from commit 4a5bceb4e49962f0498e69f5200800063d575444) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt --- .../tachiyomi/data/backup/full/FullBackupRestore.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 bf7bf8041..a73844054 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 @@ -58,6 +58,8 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa restoreManga(it, backup.backupCategories) } + // TODO: optionally trigger online library + tracker update + return true } @@ -94,16 +96,10 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa EXHMigrations.migrateBackupEntry(manga) // SY <-- - val source = backupManager.sourceManager.get(manga.source) - val sourceName = sourceMapping[manga.source] ?: manga.source.toString() - try { - if (source != null) { - restoreMangaData(manga, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata) - } else { - errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}") - } + restoreMangaData(manga, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata) } catch (e: Exception) { + val sourceName = sourceMapping[manga.source] ?: manga.source.toString() errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}") }