From f4200e2146a9c540675767206ed4664894aa1216 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 14 Oct 2020 14:15:14 -0400 Subject: [PATCH] Rewrite backup categories --- .../data/backup/full/FullBackupManager.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt index 48b6ca440..778b4d741 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt @@ -343,13 +343,14 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() { internal fun restoreCategoriesForManga(manga: Manga, categories: List, backupCategories: List) { val dbCategories = databaseHelper.getCategories().executeAsBlocking() val mangaCategoriesToUpdate = mutableListOf() - for (backupCategoryStr in categories) { - for (backupCategory in backupCategories) { - if (backupCategoryStr == backupCategory.order) { - dbCategories.firstOrNull { it.name == backupCategory.name }?.let { dbCategory -> - mangaCategoriesToUpdate.add(MangaCategory.create(manga, dbCategory)) - } - break + categories.forEach { backupCategoryOrder -> + backupCategories.firstOrNull { + it.order == backupCategoryOrder + }?.let { backupCategory -> + dbCategories.firstOrNull { dbCategory -> + dbCategory.name == backupCategory.name + }?.let { dbCategory -> + mangaCategoriesToUpdate.add(MangaCategory.create(manga, dbCategory)) } } }