diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt index d65f72d8d4..5dee132742 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt @@ -64,11 +64,11 @@ class BackupCreator( sourcesBackupCreator.backupExtensionInfo(databaseManga), if (options.appPrefs) - preferenceBackupCreator.backupAppPreferences(false) + preferenceBackupCreator.backupAppPreferences(options.includePrivate) else emptyList(), if (options.sourcePrefs) - preferenceBackupCreator.backupSourcePreferences(false) + preferenceBackupCreator.backupSourcePreferences(options.includePrivate) else emptyList(), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt index 2f7247f3cf..cd783978d1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt @@ -12,6 +12,7 @@ data class BackupOptions( val sourcePrefs: Boolean = true, val customInfo: Boolean = true, val readManga: Boolean = true, + val includePrivate: Boolean = false, ) { fun asBooleanArray() = booleanArrayOf( libraryEntries, @@ -23,6 +24,7 @@ data class BackupOptions( sourcePrefs, customInfo, readManga, + includePrivate, ) companion object { @@ -36,6 +38,7 @@ data class BackupOptions( R.string.source_settings, R.string.custom_manga_info, R.string.all_read_manga, + R.string.backup_private_pref, ) fun fromBooleanArray(array: BooleanArray): BackupOptions = BackupOptions( @@ -48,6 +51,7 @@ data class BackupOptions( array[6], array[7], array[8], + array[9], ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt index 700196c768..bfc2f53fe1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt @@ -303,7 +303,7 @@ class SettingsDataController : SettingsLegacyController() { .setTitle(R.string.what_should_backup) .setMultiChoiceItems( options.toTypedArray(), - options.map { true }.toBooleanArray(), + BackupOptions().asBooleanArray(), ) { dialog, position, _ -> if (position == 0) { val listView = (dialog as AlertDialog).listView diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 61275e3fcc..e3849e9231 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -846,6 +846,7 @@ Done in %1$s with %2$s errors Not logged into %1$s + Include sensitivve settings (e.g. tracker login tokens) Clear chapter cache