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 bc1b1fd63..b1d1d85a3 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 @@ -66,9 +66,9 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) { backup = Backup( backupManga(databaseManga, flags), - backupCategories(), + backupCategories(flags), backupAnime(databaseAnime, flags), - backupCategoriesAnime(), + backupCategoriesAnime(flags), emptyList(), backupExtensionInfo(databaseManga), emptyList(), @@ -160,25 +160,35 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) { } /** - * Backup the categories of library + * Backup the categories of manga library * * @return list of [BackupCategory] to be backed up */ - private fun backupCategories(): List { - return databaseHelper.getCategories() - .executeAsBlocking() - .map { BackupCategory.copyFrom(it) } + private fun backupCategories(options: Int): List { + // Check if user wants category information in backup + return if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) { + databaseHelper.getCategories() + .executeAsBlocking() + .map { BackupCategory.copyFrom(it) } + } else { + emptyList() + } } /** - * Backup the categories of library + * Backup the categories of anime library * * @return list of [BackupCategory] to be backed up */ - private fun backupCategoriesAnime(): List { - return animedatabaseHelper.getCategories() - .executeAsBlocking() - .map { BackupCategory.copyFrom(it) } + private fun backupCategoriesAnime(options: Int): List { + // Check if user wants category information in backup + return if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) { + animedatabaseHelper.getCategories() + .executeAsBlocking() + .map { BackupCategory.copyFrom(it) } + } else { + emptyList() + } } /** diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f838153ab..f8e3701cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -333,8 +333,8 @@ Fullscreen - Show navigation layout overlay - Show tap zones when reader is opened + Show tap zones overlay + Briefly show when reader is opened Dual page split Invert dual page split placement If the placement of the dual page split doesn\'t match reading direction @@ -345,7 +345,7 @@ Show reading mode Briefly show current mode when reader is opened 32-bit color - Reduces banding, but impacts performance + Reduces banding, but may impact performance Crop borders On Off @@ -365,7 +365,7 @@ Navigation Volume keys Invert volume keys - Invert tapping + Invert tap zones None Horizontal Vertical @@ -395,7 +395,7 @@ Webtoon Continuous vertical Paged - Navigation layout + Tap zones Scale type Fit screen Stretch