From 6464c005030702785ce804f523dfe0aa84dff0f6 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 14 Oct 2024 16:23:36 -0400 Subject: [PATCH] SpotlessApply --- .../more/settings/screen/SettingsSecurityScreen.kt | 4 ++-- .../eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt index a79d37ec0068..2aef01827933 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt @@ -150,7 +150,7 @@ object SettingsSecurityScreen : SearchableSettings { .toImmutableMap(), enabled = passwordProtectDownloads, - ), + ), kotlin.run { var dialogOpen by remember { mutableStateOf(false) } if (dialogOpen) { @@ -217,7 +217,7 @@ object SettingsSecurityScreen : SearchableSettings { }, // SY <-- Preference.PreferenceItem.InfoPreference(stringResource(MR.strings.secure_screen_summary)), - ) + ), ) } 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 420c9244ffa7..0c31e66d3443 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 @@ -27,7 +27,6 @@ import okio.sink import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.util.system.logcat import tachiyomi.data.DatabaseHandler -import tachiyomi.data.manga.MangaMapper import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.manga.interactor.GetFavorites import tachiyomi.domain.manga.interactor.GetMergedManga @@ -91,7 +90,8 @@ class BackupCreator( // SY --> val mergedManga = getMergedManga.await() // SY <-- - val backupManga = backupMangas(getFavorites.await() + nonFavoriteManga /* SY --> */ + mergedManga /* SY <-- */, options) + val backupManga = + backupMangas(getFavorites.await() + nonFavoriteManga /* SY --> */ + mergedManga /* SY <-- */, options) val backup = Backup( backupManga = backupManga,